Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9576c2f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locks-v4.4-1' of git://git.samba.org/jlayton/linux 

Pull file locking updates from Jeff Layton:
 "The largest series of changes is from Ben who offered up a set to add
  a new helper function for setting locks based on the type set in
  fl_flags.  Dmitry also send in a fix for a potential race that he
  found with KTSAN"

* tag 'locks-v4.4-1' of git://git.samba.org/jlayton/linux:
  locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait
  Move locks API users to locks_lock_inode_wait()
  locks: introduce locks_lock_inode_wait()
  locks: Use more file_inode and fix a comment
  fs: fix data races on inode->i_flctx
  locks: change tracepoint for generic_add_lease
parents 8e483ed1 616fb38f

drivers/staging/lustre/lustre/llite/file.c

+2 −6
Original line number Diff line number Diff line
@@ -2750,13 +2750,9 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock) 
	rc = md_enqueue(sbi->ll_md_exp, &einfo, NULL,

			op_data, &lockh, &flock, 0, NULL /* req */, flags);



	if ((file_lock->fl_flags & FL_FLOCK) &&

	    (rc == 0 || file_lock->fl_type == F_UNLCK))

		rc2  = flock_lock_file_wait(file, file_lock);

	if ((file_lock->fl_flags & FL_POSIX) &&

	    (rc == 0 || file_lock->fl_type == F_UNLCK) &&

	if ((rc == 0 || file_lock->fl_type == F_UNLCK) &&

	    !(flags & LDLM_FL_TEST_LOCK))

		rc2  = posix_lock_file_wait(file, file_lock);

		rc2  = locks_lock_file_wait(file, file_lock);



	if (rc2 && file_lock->fl_type != F_UNLCK) {

		einfo.ei_mode = LCK_NL;

fs/9p/vfs_file.c

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl) 
	if ((fl->fl_flags & FL_POSIX) != FL_POSIX)

		BUG();



	res = posix_lock_file_wait(filp, fl);

	res = locks_lock_file_wait(filp, fl);

	if (res < 0)

		goto out;
@@ -231,7 +231,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl) 
	if (res < 0 && fl->fl_type != F_UNLCK) {

		fl_type = fl->fl_type;

		fl->fl_type = F_UNLCK;

		res = posix_lock_file_wait(filp, fl);

		res = locks_lock_file_wait(filp, fl);

		fl->fl_type = fl_type;

	}

out:

fs/ceph/locks.c

+2 −2
Original line number Diff line number Diff line
@@ -228,12 +228,12 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl) 
	err = ceph_lock_message(CEPH_LOCK_FLOCK, CEPH_MDS_OP_SETFILELOCK,

				file, lock_cmd, wait, fl);

	if (!err) {

		err = flock_lock_file_wait(file, fl);

		err = locks_lock_file_wait(file, fl);

		if (err) {

			ceph_lock_message(CEPH_LOCK_FLOCK,

					  CEPH_MDS_OP_SETFILELOCK,

					  file, CEPH_LOCK_UNLOCK, 0, fl);

			dout("got %d on flock_lock_file_wait, undid lock", err);

			dout("got %d on locks_lock_file_wait, undid lock", err);

		}

	}

	return err;

fs/cifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1553,7 +1553,7 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type, 


out:

	if (flock->fl_flags & FL_POSIX && !rc)

		rc = posix_lock_file_wait(file, flock);

		rc = locks_lock_file_wait(file, flock);

	return rc;

}

fs/dlm/plock.c

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file, 
	rv = op->info.rv;



	if (!rv) {

		if (posix_lock_file_wait(file, fl) < 0)

		if (locks_lock_file_wait(file, fl) < 0)

			log_error(ls, "dlm_posix_lock: vfs lock error %llx",

				  (unsigned long long)number);

	}
@@ -262,7 +262,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file, 
	/* cause the vfs unlock to return ENOENT if lock is not found */

	fl->fl_flags |= FL_EXISTS;



	rv = posix_lock_file_wait(file, fl);

	rv = locks_lock_file_wait(file, fl);

	if (rv == -ENOENT) {

		rv = 0;

		goto out_free;