浏览代码

nfsd: deal with DELEGRETURN racing with CB_RECALL

We have observed the server sending recalls for delegation stateids
that have already been successfully returned. Change
nfsd4_cb_recall_done() to return success if the client has returned
the delegation. While this does not completely eliminate the sending
of recalls for delegations that have already been returned, this
does prevent unnecessarily declaring the callback path to be down.

Reported-by: Eric Meddaugh <etmsys@rit.edu>
Signed-off-by: Andrew Elble <aweits@rit.edu>
Acked-by: Jeff Layton <jlayton@poochiereds.net>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Andrew Elble 10 年之前
父节点
当前提交
a457974f1b
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      fs/nfsd/nfs4state.c

+ 3 - 0
fs/nfsd/nfs4state.c

@@ -3510,6 +3510,9 @@ static int nfsd4_cb_recall_done(struct nfsd4_callback *cb,
 {
 {
 	struct nfs4_delegation *dp = cb_to_delegation(cb);
 	struct nfs4_delegation *dp = cb_to_delegation(cb);
 
 
+	if (dp->dl_stid.sc_type == NFS4_CLOSED_DELEG_STID)
+	        return 1;
+
 	switch (task->tk_status) {
 	switch (task->tk_status) {
 	case 0:
 	case 0:
 		return 1;
 		return 1;