nfsd: move cb_need_restart flag into cb_flags

Since there is now a cb_flags word, use a new NFSD4_CALLBACK_REQUEUE
flag in that instead of a separate boolean.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index bb2cb0d1b7885bf5f6be39221cb3dd95518326e5..018533bb83a3ca6fda46e072eebca6d2583c393a 100644 (file)
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -1071,7 +1071,7 @@ static void nfsd4_requeue_cb(struct rpc_task *task, struct nfsd4_callback *cb)
        if (!test_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags)) {
                trace_nfsd_cb_restart(clp, cb);
                task->tk_status = 0;
-               cb->cb_need_restart = true;
+               set_bit(NFSD4_CALLBACK_REQUEUE, &cb->cb_flags);
        }
 }
 
@@ -1479,7 +1479,7 @@ static void nfsd4_cb_release(void *calldata)
 
        trace_nfsd_cb_rpc_release(cb->cb_clp);
 
-       if (cb->cb_need_restart)
+       if (test_bit(NFSD4_CALLBACK_REQUEUE, &cb->cb_flags))
                nfsd4_queue_cb(cb);
        else
                nfsd41_destroy_cb(cb);
@@ -1618,12 +1618,11 @@ nfsd4_run_cb_work(struct work_struct *work)
                return;
        }
 
-       if (cb->cb_need_restart) {
-               cb->cb_need_restart = false;
-       } else {
+       if (!test_and_clear_bit(NFSD4_CALLBACK_REQUEUE, &cb->cb_flags)) {
                if (cb->cb_ops && cb->cb_ops->prepare)
                        cb->cb_ops->prepare(cb);
        }
+
        cb->cb_msg.rpc_cred = clp->cl_cb_cred;
        flags = clp->cl_minorversion ? RPC_TASK_NOCONNECT : RPC_TASK_SOFTCONN;
        rpc_call_async(clnt, &cb->cb_msg, RPC_TASK_SOFT | flags,
@@ -1641,7 +1640,6 @@ void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,
        cb->cb_ops = ops;
        INIT_WORK(&cb->cb_work, nfsd4_run_cb_work);
        cb->cb_status = 0;
-       cb->cb_need_restart = false;
        cb->cb_held_slot = -1;
 }
 

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index acb9792d8273057f33325216a5ec047cadc5deef..cd469bde6859e2274d5ea7367870e5aab4d0bd29 100644 (file)
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -69,13 +69,13 @@ struct nfsd4_callback {
        struct rpc_message cb_msg;
 #define NFSD4_CALLBACK_RUNNING         (0)
 #define NFSD4_CALLBACK_WAKE            (1)
+#define NFSD4_CALLBACK_REQUEUE         (2)
        unsigned long cb_flags;
        const struct nfsd4_callback_ops *cb_ops;
        struct work_struct cb_work;
        int cb_seq_status;
        int cb_status;
        int cb_held_slot;
-       bool cb_need_restart;
 };
 
 struct nfsd4_callback_ops {

diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index d93573504fa4d3055a4bf483d8a0786e66eeac1f..a7630e9f657776a9335ba68ad223641e3ed9121a 100644 (file)
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -1616,7 +1616,7 @@ DECLARE_EVENT_CLASS(nfsd_cb_lifetime_class,
                __entry->cl_id = clp->cl_clientid.cl_id;
                __entry->cb = cb;
                __entry->opcode = cb->cb_ops ? cb->cb_ops->opcode : _CB_NULL;
-               __entry->need_restart = cb->cb_need_restart;
+               __entry->need_restart = test_bit(NFSD4_CALLBACK_REQUEUE, &cb->cb_flags);
                __assign_sockaddr(addr, &clp->cl_cb_conn.cb_addr,
                                  clp->cl_cb_conn.cb_addrlen)
        ),