Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jul 2013 16:10:19 +0000 (09:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jul 2013 16:10:19 +0000 (09:10 -0700)
Pull second set of VFS changes from Al Viro:
 "Assorted f_pos race fixes, making do_splice_direct() safe to call with
  i_mutex on parent, O_TMPFILE support, Jeff's locks.c series,
  ->d_hash/->d_compare calling conventions changes from Linus, misc
  stuff all over the place."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
  Document ->tmpfile()
  ext4: ->tmpfile() support
  vfs: export lseek_execute() to modules
  lseek_execute() doesn't need an inode passed to it
  block_dev: switch to fixed_size_llseek()
  cpqphp_sysfs: switch to fixed_size_llseek()
  tile-srom: switch to fixed_size_llseek()
  proc_powerpc: switch to fixed_size_llseek()
  ubi/cdev: switch to fixed_size_llseek()
  pci/proc: switch to fixed_size_llseek()
  isapnp: switch to fixed_size_llseek()
  lpfc: switch to fixed_size_llseek()
  locks: give the blocked_hash its own spinlock
  locks: add a new "lm_owner_key" lock operation
  locks: turn the blocked_list into a hashtable
  locks: convert fl_link to a hlist_node
  locks: avoid taking global lock if possible when waking up blocked waiters
  locks: protect most of the file_lock handling with i_lock
  locks: encapsulate the fl_link list handling
  locks: make "added" in __posix_lock_file a bool
  ...

13 files changed:
1  2 
Documentation/filesystems/Locking
Documentation/filesystems/vfs.txt
drivers/staging/comedi/comedi_fops.c
fs/cifs/file.c
fs/dcache.c
fs/exec.c
fs/ext3/namei.c
fs/ext4/file.c
fs/ext4/namei.c
fs/fuse/file.c
fs/gfs2/file.c
fs/splice.c
include/linux/fs.h

Simple merge
Simple merge
Simple merge
diff --cc fs/cifs/file.c
Simple merge
diff --cc fs/dcache.c
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc fs/ext3/namei.c
Simple merge
diff --cc fs/ext4/file.c
Simple merge
diff --cc fs/ext4/namei.c
Simple merge
diff --cc fs/fuse/file.c
Simple merge
diff --cc fs/gfs2/file.c
Simple merge
diff --cc fs/splice.c
Simple merge
Simple merge