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

Commit 1ea67dbd authored by Jeff Layton's avatar Jeff Layton Committed by Anna Schumaker
Browse files

nfs: move nfs4_set_lock_state call into caller 



We need to have this info set up before adding the waiter to the
waitqueue, so move this out of the _nfs4_proc_setlk and into the
caller. That's more efficient anyway since we don't need to do
this more than once if we end up waiting on the lock.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent db783688

fs/nfs/nfs4proc.c

+10 −8
Original line number Diff line number Diff line
@@ -6135,15 +6135,8 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock 
	struct nfs_inode *nfsi = NFS_I(state->inode);

	struct nfs4_state_owner *sp = state->owner;

	unsigned char fl_flags = request->fl_flags;

	int status = -ENOLCK;

	int status;



	if ((fl_flags & FL_POSIX) &&

			!test_bit(NFS_STATE_POSIX_LOCKS, &state->flags))

		goto out;

	/* Is this a delegated open? */

	status = nfs4_set_lock_state(state, request);

	if (status != 0)

		goto out;

	request->fl_flags |= FL_ACCESS;

	status = locks_lock_inode_wait(state->inode, request);

	if (status < 0)
@@ -6217,6 +6210,11 @@ nfs4_proc_lock(struct file *filp, int cmd, struct file_lock *request) 


	if (state == NULL)

		return -ENOLCK;



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

	    !test_bit(NFS_STATE_POSIX_LOCKS, &state->flags))

		return -ENOLCK;



	/*

	 * Don't rely on the VFS having checked the file open mode,

	 * since it won't do this for flock() locks.
@@ -6231,6 +6229,10 @@ nfs4_proc_lock(struct file *filp, int cmd, struct file_lock *request) 
			return -EBADF;

	}



	status = nfs4_set_lock_state(state, request);

	if (status != 0)

		return status;



	do {

		status = nfs4_proc_setlk(state, cmd, request);

		if ((status != -EAGAIN) || IS_SETLK(cmd))