]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jan 2016 20:24:56 +0000 (12:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jan 2016 20:24:56 +0000 (12:24 -0800)
Pull final vfs updates from Al Viro:

 - The ->i_mutex wrappers (with small prereq in lustre)

 - a fix for too early freeing of symlink bodies on shmem (they need to
   be RCU-delayed) (-stable fodder)

 - followup to dedupe stuff merged this cycle

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: abort dedupe loop if fatal signals are pending
  make sure that freeing shmem fast symlinks is RCU-delayed
  wrappers for ->i_mutex access
  lustre: remove unused declaration

1  2 
fs/block_dev.c
fs/dax.c
fs/ext4/file.c
fs/inode.c
fs/xfs/xfs_file.c
include/linux/fs.h
mm/filemap.c

diff --cc fs/block_dev.c
Simple merge
diff --cc fs/dax.c
Simple merge
diff --cc fs/ext4/file.c
Simple merge
diff --cc fs/inode.c
Simple merge
Simple merge
Simple merge
diff --cc mm/filemap.c
Simple merge