diff options
author | Jeff Layton <jlayton@redhat.com> | 2010-09-17 17:31:06 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-09-17 17:31:06 -0400 |
commit | e8582a8b96f329083b4da29aa87bc43cc0d80dd1 (patch) | |
tree | f0efdb995432c3559e6827994dcd3e77fa8c120e /fs/nfs/nfs3xdr.c | |
parent | 920769f031a8aff87b66bdf49d1a0d0988241ef9 (diff) | |
download | linux-stable-e8582a8b96f329083b4da29aa87bc43cc0d80dd1.tar.gz linux-stable-e8582a8b96f329083b4da29aa87bc43cc0d80dd1.tar.bz2 linux-stable-e8582a8b96f329083b4da29aa87bc43cc0d80dd1.zip |
nfs: standardize the rename response container
Right now, v3 and v4 have their own variants. Create a standard struct
that will work for v3 and v4. v2 doesn't get anything but a simple error
and so isn't affected by this.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs3xdr.c')
-rw-r--r-- | fs/nfs/nfs3xdr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index f385759eb35b..89c40f8ec6e6 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c @@ -970,14 +970,14 @@ nfs3_xdr_createres(struct rpc_rqst *req, __be32 *p, struct nfs3_diropres *res) * Decode RENAME reply */ static int -nfs3_xdr_renameres(struct rpc_rqst *req, __be32 *p, struct nfs3_renameres *res) +nfs3_xdr_renameres(struct rpc_rqst *req, __be32 *p, struct nfs_renameres *res) { int status; if ((status = ntohl(*p++)) != 0) status = nfs_stat_to_errno(status); - p = xdr_decode_wcc_data(p, res->fromattr); - p = xdr_decode_wcc_data(p, res->toattr); + p = xdr_decode_wcc_data(p, res->old_fattr); + p = xdr_decode_wcc_data(p, res->new_fattr); return status; } |