nfsd: remove nfsd4_callback.cb_op

[firefly-linux-kernel-4.4.55.git] / fs / nfsd / nfs4callback.c

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index e0be57b0f79bb8027bc888da08e2c821b1426d85..06e07e18ea78d8129606e43898e6652824332779 100644 (file)
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -55,6 +55,9 @@ enum {
        NFSPROC4_CLNT_CB_SEQUENCE,
 };
 
+#define to_delegation(cb) \
+       container_of(cb, struct nfs4_delegation, dl_recall)
+
 struct nfs4_cb_compound_hdr {
        /* args */
        u32             ident;  /* minorversion 0 only */
@@ -494,7 +497,7 @@ static void nfs4_xdr_enc_cb_null(struct rpc_rqst *req, struct xdr_stream *xdr,
 static void nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, struct xdr_stream *xdr,
                                   const struct nfsd4_callback *cb)
 {
-       const struct nfs4_delegation *args = cb->cb_op;
+       const struct nfs4_delegation *dp = to_delegation(cb);
        struct nfs4_cb_compound_hdr hdr = {
                .ident = cb->cb_clp->cl_cb_ident,
                .minorversion = cb->cb_minorversion,
@@ -502,7 +505,7 @@ static void nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, struct xdr_stream *xdr,
 
        encode_cb_compound4args(xdr, &hdr);
        encode_cb_sequence4args(xdr, cb, &hdr);
-       encode_cb_recall4args(xdr, args, &hdr);
+       encode_cb_recall4args(xdr, dp, &hdr);
        encode_cb_nops(&hdr);
 }
 
@@ -755,7 +758,6 @@ static void do_probe_callback(struct nfs4_client *clp)
 {
        struct nfsd4_callback *cb = &clp->cl_cb_null;
 
-       cb->cb_op = NULL;
        cb->cb_clp = clp;
 
        cb->cb_msg.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL];
@@ -847,17 +849,13 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata)
                rpc_wake_up_next(&clp->cl_cb_waitq);
                dprintk("%s: freed slot, new seqid=%d\n", __func__,
                        clp->cl_cb_session->se_cb_seq_nr);
-
-               /* We're done looking into the sequence information */
-               task->tk_msg.rpc_resp = NULL;
        }
 }
 
-
 static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata)
 {
        struct nfsd4_callback *cb = calldata;
-       struct nfs4_delegation *dp = container_of(cb, struct nfs4_delegation, dl_recall);
+       struct nfs4_delegation *dp = to_delegation(cb);
        struct nfs4_client *clp = cb->cb_clp;
        struct rpc_clnt *current_rpc_client = clp->cl_cb_client;
 
@@ -874,24 +872,21 @@ static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata)
                return;
        switch (task->tk_status) {
        case 0:
-               cb->cb_done = true;
-               return;
+               break;
        case -EBADHANDLE:
        case -NFS4ERR_BAD_STATEID:
                /* Race: client probably got cb_recall
                 * before open reply granting delegation */
-               break;
+               if (dp->dl_retries--) {
+                       rpc_delay(task, 2*HZ);
+                       task->tk_status = 0;
+                       rpc_restart_call_prepare(task);
+                       return;
+               }
        default:
                /* Network partition? */
                nfsd4_mark_cb_down(clp, task->tk_status);
        }
-       if (dp->dl_retries--) {
-               rpc_delay(task, 2*HZ);
-               task->tk_status = 0;
-               rpc_restart_call_prepare(task);
-               return;
-       }
-       nfsd4_mark_cb_down(clp, task->tk_status);
        cb->cb_done = true;
 }
 
@@ -899,9 +894,10 @@ static void nfsd4_cb_recall_release(void *calldata)
 {
        struct nfsd4_callback *cb = calldata;
        struct nfs4_client *clp = cb->cb_clp;
-       struct nfs4_delegation *dp = container_of(cb, struct nfs4_delegation, dl_recall);
 
        if (cb->cb_done) {
+               struct nfs4_delegation *dp = to_delegation(cb);
+
                spin_lock(&clp->cl_lock);
                list_del(&cb->cb_per_client);
                spin_unlock(&clp->cl_lock);
@@ -1046,7 +1042,7 @@ nfsd4_run_cb_recall(struct work_struct *w)
        struct nfsd4_callback *cb = container_of(w, struct nfsd4_callback,
                                                        cb_work);
 
-       nfsd4_prepare_cb_recall(cb->cb_op);
+       nfsd4_prepare_cb_recall(to_delegation(cb));
        nfsd4_run_callback_rpc(cb);
 }
 
@@ -1056,7 +1052,6 @@ void nfsd4_cb_recall(struct nfs4_delegation *dp)
        struct nfs4_client *clp = dp->dl_stid.sc_client;
 
        dp->dl_retries = 1;
-       cb->cb_op = dp;
        cb->cb_clp = clp;
        cb->cb_msg.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL];
        cb->cb_msg.rpc_argp = cb;