Skip to content

Commit a082e4b

Browse files
Olga Kornievskaiachucklever
authored andcommitted
nfsd: nfserr_jukebox in nlm_fopen should lead to a retry
When v3 NLM request finds a conflicting delegation, it triggers a delegation recall and nfsd_open fails with EAGAIN. nfsd_open then translates EAGAIN into nfserr_jukebox. In nlm_fopen, instead of returning nlm_failed for when there is a conflicting delegation, drop this NLM request so that the client retries. Once delegation is recalled and if a local lock is claimed, a retry would lead to nfsd returning a nlm_lck_blocked error or a successful nlm lock. Fixes: d343fce ("[PATCH] knfsd: Allow lockd to drop replies as appropriate") Cc: stable@vger.kernel.org # v6.6 Signed-off-by: Olga Kornievskaia <okorniev@redhat.com> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 8ddd06b commit a082e4b

1 file changed

Lines changed: 15 additions & 0 deletions

File tree

fs/nfsd/lockd.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,21 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp,
5757
switch (nfserr) {
5858
case nfs_ok:
5959
return 0;
60+
case nfserr_jukebox:
61+
/* this error can indicate a presence of a conflicting
62+
* delegation to an NLM lock request. Options are:
63+
* (1) For now, drop this request and make the client
64+
* retry. When delegation is returned, client's lock retry
65+
* will complete.
66+
* (2) NLM4_DENIED as per "spec" signals to the client
67+
* that the lock is unavailable now but client can retry.
68+
* Linux client implementation does not. It treats
69+
* NLM4_DENIED same as NLM4_FAILED and errors the request.
70+
* (3) For the future, treat this as blocked lock and try
71+
* to callback when the delegation is returned but might
72+
* not have a proper lock request to block on.
73+
*/
74+
fallthrough;
6075
case nfserr_dropit:
6176
return nlm_drop_reply;
6277
case nfserr_stale:

0 commit comments

Comments
 (0)