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

NFSv4: Handle NFS4ERR_DELAY and NFS4ERR_GRACE in nfs4_lock_delegation_recall 



A server shouldn't normally return NFS4ERR_GRACE if the client holds a
delegation, since no conflicting lock reclaims can be granted, however
the spec does not require the server to grant the lock in this
instance.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org
parent cb607187

fs/nfs/nfs4proc.c

+6 −0
Original line number Diff line number Diff line
@@ -5176,6 +5176,12 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) 
				nfs4_schedule_stateid_recovery(server, state);

				err = 0;

				goto out;

			case -NFS4ERR_DELAY:

			case -NFS4ERR_GRACE:

				set_bit(NFS_DELEGATED_STATE, &state->flags);

				ssleep(1);

				err = -EAGAIN;

				goto out;

			case -ENOMEM:

			case -NFS4ERR_DENIED:

				/* kill_proc(fl->fl_pid, SIGLOST, 1); */