浏览代码

nfsd4: remove extra put() on callback errors

Since rpc_call_async() guarantees that the release method will be called
even on failure, this put is wrong.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
J. Bruce Fields 15 年之前
父节点
当前提交
378b7d37f9
共有 1 个文件被更改,包括 1 次插入5 次删除
  1. 1 5
      fs/nfsd/nfs4callback.c

+ 1 - 5
fs/nfsd/nfs4callback.c

@@ -752,7 +752,6 @@ static void _nfsd4_cb_recall(struct nfs4_delegation *dp)
 		.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL],
 		.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL],
 		.rpc_cred = callback_cred
 		.rpc_cred = callback_cred
 	};
 	};
-	int status;
 
 
 	if (clnt == NULL)
 	if (clnt == NULL)
 		return; /* Client is shutting down; give up. */
 		return; /* Client is shutting down; give up. */
@@ -760,10 +759,7 @@ static void _nfsd4_cb_recall(struct nfs4_delegation *dp)
 	args->args_op = dp;
 	args->args_op = dp;
 	msg.rpc_argp = args;
 	msg.rpc_argp = args;
 	dp->dl_retries = 1;
 	dp->dl_retries = 1;
-	status = rpc_call_async(clnt, &msg, RPC_TASK_SOFT,
-				&nfsd4_cb_recall_ops, dp);
-	if (status)
-		nfs4_put_delegation(dp);
+	rpc_call_async(clnt, &msg, RPC_TASK_SOFT, &nfsd4_cb_recall_ops, dp);
 }
 }
 
 
 void nfsd4_do_callback_rpc(struct work_struct *w)
 void nfsd4_do_callback_rpc(struct work_struct *w)