linux.git/include/linux/fs.h, branch v4.0-rc4

Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux

2015-02-18T18:21:47+00:00

Pull file locking fixes from Jeff Layton:
 "A small set of patches to fix problems with the recent file locking
  changes that we discussed earlier this week"
"

* tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux:
  locks: fix list insertion when lock is split in two
  locks: remove conditional lock release in middle of flock_lock_file
  locks: only remove leases associated with the file being closed
  Revert "locks: keep a count of locks on the flctx lists"

Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-02-18T00:12:34+00:00

Pull lazytime mount option support from Al Viro:
 "Lazytime stuff from tytso"

* 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ext4: add optimization for the lazytime mount option
  vfs: add find_inode_nowait() function
  vfs: add support for a lazytime mount option

Merge branch 'iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-02-17T23:48:33+00:00

Pull iov_iter updates from Al Viro:
 "More iov_iter work - missing counterpart of iov_iter_init() for
  bvec-backed ones and vfs_read_iter()/vfs_write_iter() - wrappers for
  sync calls of ->read_iter()/->write_iter()"

* 'iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: add vfs_iter_{read,write} helpers
  new helper: iov_iter_bvec()

Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-02-17T23:27:47+00:00

Pull getname/putname updates from Al Viro:
 "Rework of getname/getname_kernel/etc., mostly from Paul Moore.  Gets
  rid of quite a pile of kludges between namei and audit..."

* 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  audit: replace getname()/putname() hacks with reference counters
  audit: fix filename matching in __audit_inode() and __audit_inode_child()
  audit: enable filename recording via getname_kernel()
  simpler calling conventions for filename_mountpoint()
  fs: create proper filename objects using getname_kernel()
  fs: rework getname_kernel to handle up to PATH_MAX sized filenames
  cut down the number of do_path_lookup() callers

dax: add dax_zero_page_range

2015-02-17T01:56:04+00:00

This new function allows us to support hole-punch for DAX files by zeroing
a partial page, as opposed to the dax_truncate_page() function which can
only truncate to the end of the page.  Reimplement dax_truncate_page() to
call dax_zero_page_range().

[ross.zwisler@linux.intel.com: ported to 3.13-rc2]
[akpm@linux-foundation.org: fix typos in comments]
Signed-off-by: Matthew Wilcox 
Signed-off-by: Ross Zwisler 
Cc: Andreas Dilger 
Cc: Boaz Harrosh 
Cc: Christoph Hellwig 
Cc: Dave Chinner 
Cc: Jan Kara 
Cc: Jens Axboe 
Cc: Kirill A. Shutemov 
Cc: Mathieu Desnoyers 
Cc: Randy Dunlap 
Cc: Theodore Ts'o 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

vfs,ext2: remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX

2015-02-17T01:56:04+00:00

The fewer Kconfig options we have the better.  Use the generic
CONFIG_FS_DAX to enable XIP support in ext2 as well as in the core.

Signed-off-by: Matthew Wilcox 
Cc: Andreas Dilger 
Cc: Boaz Harrosh 
Cc: Christoph Hellwig 
Cc: Dave Chinner 
Cc: Jan Kara 
Cc: Jens Axboe 
Cc: Kirill A. Shutemov 
Cc: Mathieu Desnoyers 
Cc: Randy Dunlap 
Cc: Ross Zwisler 
Cc: Theodore Ts'o 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

vfs: remove get_xip_mem

2015-02-17T01:56:03+00:00

All callers of get_xip_mem() are now gone.  Remove checks for it,
initialisers of it, documentation of it and the only implementation of it.
 Also remove mm/filemap_xip.c as it is now empty.  Also remove
documentation of the long-gone get_xip_page().

Signed-off-by: Matthew Wilcox 
Cc: Andreas Dilger 
Cc: Boaz Harrosh 
Cc: Christoph Hellwig 
Cc: Dave Chinner 
Cc: Jan Kara 
Cc: Jens Axboe 
Cc: Kirill A. Shutemov 
Cc: Mathieu Desnoyers 
Cc: Randy Dunlap 
Cc: Ross Zwisler 
Cc: Theodore Ts'o 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dax,ext2: replace xip_truncate_page with dax_truncate_page

2015-02-17T01:56:03+00:00

It takes a get_block parameter just like nobh_truncate_page() and
block_truncate_page()

Signed-off-by: Matthew Wilcox 
Reviewed-by: Mathieu Desnoyers 
Cc: Andreas Dilger 
Cc: Boaz Harrosh 
Cc: Christoph Hellwig 
Cc: Dave Chinner 
Cc: Jan Kara 
Cc: Jens Axboe 
Cc: Kirill A. Shutemov 
Cc: Randy Dunlap 
Cc: Ross Zwisler 
Cc: Theodore Ts'o 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dax,ext2: replace the XIP page fault handler with the DAX page fault handler

2015-02-17T01:56:03+00:00

Instead of calling aops->get_xip_mem from the fault handler, the
filesystem passes a get_block_t that is used to find the appropriate
blocks.

This requires that all architectures implement copy_user_page().  At the
time of writing, mips and arm do not.  Patches exist and are in progress.

[akpm@linux-foundation.org: remap_file_pages went away]
Signed-off-by: Matthew Wilcox 
Reviewed-by: Jan Kara 
Cc: Andreas Dilger 
Cc: Boaz Harrosh 
Cc: Christoph Hellwig 
Cc: Dave Chinner 
Cc: Jens Axboe 
Cc: Kirill A. Shutemov 
Cc: Mathieu Desnoyers 
Cc: Randy Dunlap 
Cc: Ross Zwisler 
Cc: Theodore Ts'o 
Cc: Russell King 
Cc: Ralf Baechle 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dax,ext2: replace ext2_clear_xip_target with dax_clear_blocks

2015-02-17T01:56:03+00:00

This is practically generic code; other filesystems will want to call it
from other places, but there's nothing ext2-specific about it.

Make it a little more generic by allowing it to take a count of the number
of bytes to zero rather than fixing it to a single page.  Thanks to Dave
Hansen for suggesting that I need to call cond_resched() if zeroing more
than one page.

Signed-off-by: Matthew Wilcox 
Cc: Andreas Dilger 
Cc: Boaz Harrosh 
Cc: Christoph Hellwig 
Cc: Dave Chinner 
Cc: Jan Kara 
Cc: Jens Axboe 
Cc: Kirill A. Shutemov 
Cc: Mathieu Desnoyers 
Cc: Randy Dunlap 
Cc: Ross Zwisler 
Cc: Theodore Ts'o 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds