2005-03-08 06:06:56

by NeilBrown

[permalink] [raw]
Subject: [PATCH kNFSd 34 of 54] nfsd4: trivial callback cleanup



Whitespace, etc.

Signed-off-by: J. Bruce Fields <[email protected]>
Signed-off-by: Neil Brown <[email protected]>

### Diffstat output
./fs/nfsd/nfs4callback.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)

diff ./fs/nfsd/nfs4callback.c~current~ ./fs/nfsd/nfs4callback.c
--- ./fs/nfsd/nfs4callback.c~current~ 2005-03-07 11:36:31.000000000 +1100
+++ ./fs/nfsd/nfs4callback.c 2005-03-07 11:36:32.000000000 +1100
@@ -310,7 +310,7 @@ nfs4_xdr_dec_cb_recall(struct rpc_rqst *
if (status)
goto out;
status = decode_cb_op_hdr(&xdr, OP_CB_RECALL);
-out :
+out:
return status;
}

@@ -545,24 +545,20 @@ retry:
void
nfsd4_cb_recall(struct nfs4_delegation *dp)
{
- struct nfs4_client *clp;
- struct rpc_clnt *clnt;
+ struct nfs4_client *clp = dp->dl_client;
+ struct rpc_clnt *clnt = clp->cl_callback.cb_client;
+ struct nfs4_cb_recall *cbr = &dp->dl_recall;
struct rpc_message msg = {
.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL],
+ .rpc_argp = cbr,
+ .rpc_resp = cbr,
};
- struct nfs4_cb_recall *cbr = &dp->dl_recall;
int status;

- dprintk("NFSD: nfsd4_cb_recall NFS4_enc_cb_recall_sz %d NFS4_dec_cb_recall_sz %d \n",NFS4_enc_cb_recall_sz,NFS4_dec_cb_recall_sz);
-
- clp = dp->dl_client;
- clnt = clp->cl_callback.cb_client;
if ((!atomic_read(&clp->cl_callback.cb_set)) || !clnt)
return;

- msg.rpc_argp = cbr;
- msg.rpc_resp = cbr;
- msg.rpc_cred = nfsd4_lookupcred(clp,0);
+ msg.rpc_cred = nfsd4_lookupcred(clp, 0);
if (IS_ERR(msg.rpc_cred))
return;



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs