Skip to content

Commit 6d7f3f9

Browse files
committed
NFSv4: handle ERR_GRACE on delegation recalls
jira KERNEL-206 Rebuild_History Non-Buildable kernel-6.12.0-124.13.1.el10_1 commit-author Olga Kornievskaia <okorniev@redhat.com> commit be390f9 RFC7530 states that clients should be prepared for the return of NFS4ERR_GRACE errors for non-reclaim lock and I/O requests. Signed-off-by: Olga Kornievskaia <okorniev@redhat.com> Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com> (cherry picked from commit be390f9) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 52524da commit 6d7f3f9

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

fs/nfs/nfs4proc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7831,10 +7831,10 @@ int nfs4_lock_delegation_recall(struct file_lock *fl, struct nfs4_state *state,
78317831
return err;
78327832
do {
78337833
err = _nfs4_do_setlk(state, F_SETLK, fl, NFS_LOCK_NEW);
7834-
if (err != -NFS4ERR_DELAY)
7834+
if (err != -NFS4ERR_DELAY && err != -NFS4ERR_GRACE)
78357835
break;
78367836
ssleep(1);
7837-
} while (err == -NFS4ERR_DELAY);
7837+
} while (err == -NFS4ERR_DELAY || err == -NFSERR_GRACE);
78387838
return nfs4_handle_delegation_recall_error(server, state, stateid, fl, err);
78397839
}
78407840

0 commit comments

Comments
 (0)