Commit c4d7c402 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Remove the buggy lock-if-signalled case from do_setlk() 



Both NLM and NFSv4 should be able to clean up adequately in the case where
the user interrupts the RPC call...

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 5f50c0c6

fs/nfs/file.c

+2 −10
Original line number Diff line number Diff line
@@ -566,17 +566,9 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl) 


	lock_kernel();

	/* Use local locking if mounted with "-onolock" */

	if (!(NFS_SERVER(inode)->flags & NFS_MOUNT_NONLM)) {

	if (!(NFS_SERVER(inode)->flags & NFS_MOUNT_NONLM))

		status = NFS_PROTO(inode)->lock(filp, cmd, fl);

		/* If we were signalled we still need to ensure that

		 * we clean up any state on the server. We therefore

		 * record the lock call as having succeeded in order to

		 * ensure that locks_remove_posix() cleans it out when

		 * the process exits.

		 */

		if (status == -EINTR || status == -ERESTARTSYS)

			do_vfs_lock(filp, fl);

	} else

	else

		status = do_vfs_lock(filp, fl);

	unlock_kernel();

	if (status < 0)