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

Commit 00c569b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locks-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux 

Pull file locking updates from Jeff Layton:
 "The main change in this set is Neil Brown's work to reduce the
  thundering herd problem when a heavily-contended file lock is
  released.

  Previously we'd always wake up all waiters when this occurred. With
  this set, we'll now we only wake up waiters that were blocked on the
  range being released"

* tag 'locks-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: Use inode_is_open_for_write
  fs/locks: remove unnecessary white space.
  fs/locks: merge posix_unblock_lock() and locks_delete_block()
  fs/locks: create a tree of dependent requests.
  fs/locks: change all *_conflict() functions to return bool.
  fs/locks: always delete_block after waiting.
  fs/locks: allow a lock request to block other requests.
  fs/locks: use properly initialized file_lock when unlocking.
  ocfs2: properly initial file_lock used for unlock.
  gfs2: properly initial file_lock used for unlock.
  NFS: use locks_copy_lock() to copy locks.
  fs/locks: split out __locks_wake_up_blocks().
  fs/locks: rename some lists and pointers.
parents f6b1495f 052b8cfa

fs/cifs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -1103,10 +1103,10 @@ cifs_posix_lock_set(struct file *file, struct file_lock *flock) 
	rc = posix_lock_file(file, flock, NULL);

	up_write(&cinode->lock_sem);

	if (rc == FILE_LOCK_DEFERRED) {

		rc = wait_event_interruptible(flock->fl_wait, !flock->fl_next);

		rc = wait_event_interruptible(flock->fl_wait, !flock->fl_blocker);

		if (!rc)

			goto try_again;

		posix_unblock_lock(flock);

		locks_delete_block(flock);

	}

	return rc;

}

fs/gfs2/file.c

+5 −5
Original line number Diff line number Diff line
@@ -1199,13 +1199,13 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl) 
	mutex_lock(&fp->f_fl_mutex);



	if (gfs2_holder_initialized(fl_gh)) {

		struct file_lock request;

		if (fl_gh->gh_state == state)

			goto out;

		locks_lock_file_wait(file,

				     &(struct file_lock) {

					     .fl_type = F_UNLCK,

					     .fl_flags = FL_FLOCK

				     });

		locks_init_lock(&request);

		request.fl_type = F_UNLCK;

		request.fl_flags = FL_FLOCK;

		locks_lock_file_wait(file, &request);

		gfs2_glock_dq(fl_gh);

		gfs2_holder_reinit(state, flags, fl_gh);

	} else {

fs/lockd/svclock.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int nlmsvc_unlink_block(struct nlm_block *block) 
	dprintk("lockd: unlinking block %p...\n", block);



	/* Remove block from list */

	status = posix_unblock_lock(&block->b_call->a_args.lock.fl);

	status = locks_delete_block(&block->b_call->a_args.lock.fl);

	nlmsvc_remove_block(block);

	return status;

}

fs/locks.c

+216 −128

File changed.

Preview size limit exceeded, changes collapsed.

fs/nfs/nfs4proc.c

+4 −2
Original line number Diff line number Diff line
@@ -6311,7 +6311,8 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl, 
	/* Ensure we don't close file until we're done freeing locks! */

	p->ctx = get_nfs_open_context(ctx);

	p->l_ctx = nfs_get_lock_context(ctx);

	memcpy(&p->fl, fl, sizeof(p->fl));

	locks_init_lock(&p->fl);

	locks_copy_lock(&p->fl, fl);

	p->server = NFS_SERVER(inode);

	return p;

}
@@ -6533,7 +6534,8 @@ static struct nfs4_lockdata *nfs4_alloc_lockdata(struct file_lock *fl, 
	p->server = server;

	refcount_inc(&lsp->ls_count);

	p->ctx = get_nfs_open_context(ctx);

	memcpy(&p->fl, fl, sizeof(p->fl));

	locks_init_lock(&p->fl);

	locks_copy_lock(&p->fl, fl);

	return p;

out_free_seqid:

	nfs_free_seqid(p->arg.open_seqid);