Commit 627fb183 authored by Chuck Lever's avatar Chuck Lever

NFSD: Remove unused @reason argument

Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent bc4a27e9
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#define NFSDDBG_FACILITY NFSDDBG_PROC #define NFSDDBG_FACILITY NFSDDBG_PROC
static void nfsd4_mark_cb_fault(struct nfs4_client *, int reason); static void nfsd4_mark_cb_fault(struct nfs4_client *clp);
#define NFSPROC4_CB_NULL 0 #define NFSPROC4_CB_NULL 0
#define NFSPROC4_CB_COMPOUND 1 #define NFSPROC4_CB_COMPOUND 1
...@@ -1012,14 +1012,14 @@ static void nfsd4_mark_cb_state(struct nfs4_client *clp, int newstate) ...@@ -1012,14 +1012,14 @@ static void nfsd4_mark_cb_state(struct nfs4_client *clp, int newstate)
} }
} }
static void nfsd4_mark_cb_down(struct nfs4_client *clp, int reason) static void nfsd4_mark_cb_down(struct nfs4_client *clp)
{ {
if (test_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags)) if (test_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags))
return; return;
nfsd4_mark_cb_state(clp, NFSD4_CB_DOWN); nfsd4_mark_cb_state(clp, NFSD4_CB_DOWN);
} }
static void nfsd4_mark_cb_fault(struct nfs4_client *clp, int reason) static void nfsd4_mark_cb_fault(struct nfs4_client *clp)
{ {
if (test_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags)) if (test_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags))
return; return;
...@@ -1031,7 +1031,7 @@ static void nfsd4_cb_probe_done(struct rpc_task *task, void *calldata) ...@@ -1031,7 +1031,7 @@ static void nfsd4_cb_probe_done(struct rpc_task *task, void *calldata)
struct nfs4_client *clp = container_of(calldata, struct nfs4_client, cl_cb_null); struct nfs4_client *clp = container_of(calldata, struct nfs4_client, cl_cb_null);
if (task->tk_status) if (task->tk_status)
nfsd4_mark_cb_down(clp, task->tk_status); nfsd4_mark_cb_down(clp);
else else
nfsd4_mark_cb_state(clp, NFSD4_CB_UP); nfsd4_mark_cb_state(clp, NFSD4_CB_UP);
} }
...@@ -1183,7 +1183,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback ...@@ -1183,7 +1183,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback
break; break;
case -ESERVERFAULT: case -ESERVERFAULT:
++session->se_cb_seq_nr; ++session->se_cb_seq_nr;
nfsd4_mark_cb_fault(cb->cb_clp, cb->cb_seq_status); nfsd4_mark_cb_fault(cb->cb_clp);
ret = false; ret = false;
break; break;
case 1: case 1:
...@@ -1195,7 +1195,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback ...@@ -1195,7 +1195,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback
*/ */
fallthrough; fallthrough;
case -NFS4ERR_BADSESSION: case -NFS4ERR_BADSESSION:
nfsd4_mark_cb_fault(cb->cb_clp, cb->cb_seq_status); nfsd4_mark_cb_fault(cb->cb_clp);
ret = false; ret = false;
goto need_restart; goto need_restart;
case -NFS4ERR_DELAY: case -NFS4ERR_DELAY:
...@@ -1214,7 +1214,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback ...@@ -1214,7 +1214,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback
} }
break; break;
default: default:
nfsd4_mark_cb_fault(cb->cb_clp, cb->cb_seq_status); nfsd4_mark_cb_fault(cb->cb_clp);
} }
nfsd41_cb_release_slot(cb); nfsd41_cb_release_slot(cb);
...@@ -1260,7 +1260,7 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata) ...@@ -1260,7 +1260,7 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata)
case -EIO: case -EIO:
case -ETIMEDOUT: case -ETIMEDOUT:
case -EACCES: case -EACCES:
nfsd4_mark_cb_down(clp, task->tk_status); nfsd4_mark_cb_down(clp);
} }
break; break;
default: default:
...@@ -1382,7 +1382,7 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb) ...@@ -1382,7 +1382,7 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb)
err = setup_callback_client(clp, &conn, ses); err = setup_callback_client(clp, &conn, ses);
if (err) { if (err) {
nfsd4_mark_cb_down(clp, err); nfsd4_mark_cb_down(clp);
if (c) if (c)
svc_xprt_put(c->cn_xprt); svc_xprt_put(c->cn_xprt);
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment