From 212be129d97d9d164e32a4a107d63f3cfe860488 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 1 Mar 2012 17:01:48 -0500 Subject: [PATCH] --- yaml --- r: 294515 b: refs/heads/master c: bb4dae5e5b5a92f0ffbcc6ac10c5e8afcd87934d h: refs/heads/master i: 294513: dda3f5f1cb60b9c6d24ce858b9738c721c08e164 294511: da1523c11ca5d0cef0f14de12b338c89974463d4 v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4xdr.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f2c130fcafb3..995bfced5116 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20d27e929fb4790a339a4ddcc9a27f14db06055b +refs/heads/master: bb4dae5e5b5a92f0ffbcc6ac10c5e8afcd87934d diff --git a/trunk/fs/nfs/nfs4xdr.c b/trunk/fs/nfs/nfs4xdr.c index b5c5212cd184..48f539314f25 100644 --- a/trunk/fs/nfs/nfs4xdr.c +++ b/trunk/fs/nfs/nfs4xdr.c @@ -1637,13 +1637,14 @@ static void encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, co hdr->replen += decode_rename_maxsz; } -static void encode_renew(struct xdr_stream *xdr, const struct nfs_client *client_stateid, struct compound_hdr *hdr) +static void encode_renew(struct xdr_stream *xdr, clientid4 clid, + struct compound_hdr *hdr) { __be32 *p; p = reserve_space(xdr, 12); *p++ = cpu_to_be32(OP_RENEW); - xdr_encode_hyper(p, client_stateid->cl_clientid); + xdr_encode_hyper(p, clid); hdr->nops++; hdr->replen += decode_renew_maxsz; } @@ -2692,7 +2693,7 @@ static void nfs4_xdr_enc_renew(struct rpc_rqst *req, struct xdr_stream *xdr, }; encode_compound_hdr(xdr, req, &hdr); - encode_renew(xdr, clp, &hdr); + encode_renew(xdr, clp->cl_clientid, &hdr); encode_nops(&hdr); }