Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux

Pull file locking related changes from Jeff Layton:
 "This release is a little more busy for file locking changes than the
  last:

   - a set of patches from Kinglong Mee to fix the lockowner handling in
     knfsd
   - a pile of cleanups to the internal file lease API.  This should get
     us a bit closer to allowing for setlease methods that can block.

  There are some dependencies between mine and Bruce's trees this cycle,
  and I based my tree on top of the requisite patches in Bruce's tree"

* tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux: (26 commits)
  locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING
  locks: flock_make_lock should return a struct file_lock (or PTR_ERR)
  locks: set fl_owner for leases to filp instead of current->files
  locks: give lm_break a return value
  locks: __break_lease cleanup in preparation of allowing direct removal of leases
  locks: remove i_have_this_lease check from __break_lease
  locks: move freeing of leases outside of i_lock
  locks: move i_lock acquisition into generic_*_lease handlers
  locks: define a lm_setup handler for leases
  locks: plumb a "priv" pointer into the setlease routines
  nfsd: don't keep a pointer to the lease in nfs4_file
  locks: clean up vfs_setlease kerneldoc comments
  locks: generic_delete_lease doesn't need a file_lock at all
  nfsd: fix potential lease memory leak in nfs4_setlease
  locks: close potential race in lease_get_mtime
  security: make security_file_set_fowner, f_setown and __f_setown void return
  locks: consolidate "nolease" routines
  locks: remove lock_may_read and lock_may_write
  lockd: rip out deferred lock handling from testlock codepath
  NFSD: Get reference of lockowner when coping file_lock
  ...

diff --cc drivers/tty/tty_io.c
Simple merge

diff --cc fs/cifs/cifsfs.c
index 889b9845575079517e92ee387fe5c863751c3848,85c70d5969ac7f008c105e310f45a291d01d141b..9d7996e8e7932bc5ad386c894e7955975394490c
--- 1/fs/cifs/cifsfs.c
--- 2/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@@ -825,11 -813,10 +826,11 @@@ cifs_setlease(struct file *file, long a
        if (!(S_ISREG(inode->i_mode)))
                return -EINVAL;
  
 -      /* check if file is oplocked */
 -      if (((arg == F_RDLCK) && CIFS_CACHE_READ(CIFS_I(inode))) ||
 +      /* Check if file is oplocked if this is request for new lease */
 +      if (arg == F_UNLCK ||
 +          ((arg == F_RDLCK) && CIFS_CACHE_READ(CIFS_I(inode))) ||
            ((arg == F_WRLCK) && CIFS_CACHE_WRITE(CIFS_I(inode))))
-               return generic_setlease(file, arg, lease);
+               return generic_setlease(file, arg, lease, priv);
        else if (tlink_tcon(cfile->tlink)->local_lease &&
                 !CIFS_CACHE_READ(CIFS_I(inode)))
                /*

diff --cc fs/gfs2/file.c
Simple merge

diff --cc fs/nfs/file.c
Simple merge

diff --cc fs/nfs/internal.h
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/nfsd/state.h
Simple merge

diff --cc net/socket.c
Simple merge