Commit ef4a48c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 90d0c376 1b2b32dc

Documentation/filesystems/Locking

+6 −5
Original line number Diff line number Diff line
@@ -464,15 +464,12 @@ prototypes: 
			size_t, unsigned int);

	ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *,

			size_t, unsigned int);

	int (*setlease)(struct file *, long, struct file_lock **);

	int (*setlease)(struct file *, long, struct file_lock **, void **);

	long (*fallocate)(struct file *, int, loff_t, loff_t);

};



locking rules:

	All may block except for ->setlease.

	No VFS locks held on entry except for ->setlease.



->setlease has the file_list_lock held and must not sleep.

	All may block.



->llseek() locking has moved from llseek to the individual llseek

implementations.  If your fs is not using generic_file_llseek, you
@@ -496,6 +493,10 @@ components. And there are other reasons why the current interface is a mess... 
->read on directories probably must go away - we should just enforce -EISDIR

in sys_read() and friends.



->setlease operations should call generic_setlease() before or after setting

the lease within the individual filesystem to record the result of the

operation



--------------------------- dquot_operations -------------------------------

prototypes:

	int (*write_dquot) (struct dquot *);

Documentation/filesystems/vfs.txt

+4 −3
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ struct file_operations { 
	int (*flock) (struct file *, int, struct file_lock *);

	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned int);

	ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int);

	int (*setlease)(struct file *, long arg, struct file_lock **);

	int (*setlease)(struct file *, long arg, struct file_lock **, void **);

	long (*fallocate)(struct file *, int mode, loff_t offset, loff_t len);

	int (*show_fdinfo)(struct seq_file *m, struct file *f);

};
@@ -895,8 +895,9 @@ otherwise noted. 
  splice_read: called by the VFS to splice data from file to a pipe. This

	       method is used by the splice(2) system call



  setlease: called by the VFS to set or release a file lock lease.

	    setlease has the file_lock_lock held and must not sleep.

  setlease: called by the VFS to set or release a file lock lease. setlease

	    implementations should call generic_setlease to record or remove

	    the lease in the inode after setting it.



  fallocate: called by the VFS to preallocate blocks or punch a hole.

drivers/net/tun.c

+1 −3
Original line number Diff line number Diff line
@@ -2152,9 +2152,7 @@ static int tun_chr_fasync(int fd, struct file *file, int on) 
		goto out;



	if (on) {

		ret = __f_setown(file, task_pid(current), PIDTYPE_PID, 0);

		if (ret)

			goto out;

		__f_setown(file, task_pid(current), PIDTYPE_PID, 0);

		tfile->flags |= TUN_FASYNC;

	} else

		tfile->flags &= ~TUN_FASYNC;

drivers/tty/tty_io.c

+2 −1
Original line number Diff line number Diff line
@@ -2186,8 +2186,9 @@ static int __tty_fasync(int fd, struct file *filp, int on) 
		}

		get_pid(pid);

		spin_unlock_irqrestore(&tty->ctrl_lock, flags);

		retval = __f_setown(filp, pid, type, 0);

		__f_setown(filp, pid, type, 0);

		put_pid(pid);

		retval = 0;

	}

out:

	return retval;

fs/cifs/cifsfs.c

+4 −3
Original line number Diff line number Diff line
@@ -813,7 +813,8 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int whence) 
	return generic_file_llseek(file, offset, whence);

}



static int cifs_setlease(struct file *file, long arg, struct file_lock **lease)

static int

cifs_setlease(struct file *file, long arg, struct file_lock **lease, void **priv)

{

	/*

	 * Note that this is called by vfs setlease with i_lock held to
@@ -829,7 +830,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **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)))

		/*
@@ -840,7 +841,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) 
		 * knows that the file won't be changed on the server by anyone

		 * else.

		 */

		return generic_setlease(file, arg, lease);

		return generic_setlease(file, arg, lease, priv);

	else

		return -EAGAIN;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE