aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nfs_xdr.h
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-09-17 17:31:06 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-09-17 17:31:06 -0400
commite8582a8b96f329083b4da29aa87bc43cc0d80dd1 (patch)
treef0efdb995432c3559e6827994dcd3e77fa8c120e /include/linux/nfs_xdr.h
parent920769f031a8aff87b66bdf49d1a0d0988241ef9 (diff)
downloadkernel_samsung_espresso10-e8582a8b96f329083b4da29aa87bc43cc0d80dd1.zip
kernel_samsung_espresso10-e8582a8b96f329083b4da29aa87bc43cc0d80dd1.tar.gz
kernel_samsung_espresso10-e8582a8b96f329083b4da29aa87bc43cc0d80dd1.tar.bz2
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 'include/linux/nfs_xdr.h')
-rw-r--r--include/linux/nfs_xdr.h23
1 files changed, 9 insertions, 14 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index acb95fb..9ad132e 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -411,6 +411,15 @@ struct nfs_renameargs {
struct nfs4_sequence_args seq_args;
};
+struct nfs_renameres {
+ const struct nfs_server *server;
+ struct nfs4_change_info old_cinfo;
+ struct nfs_fattr *old_fattr;
+ struct nfs4_change_info new_cinfo;
+ struct nfs_fattr *new_fattr;
+ struct nfs4_sequence_res seq_res;
+};
+
/*
* Argument struct for decode_entry function
*/
@@ -623,11 +632,6 @@ struct nfs3_readlinkargs {
struct page ** pages;
};
-struct nfs3_renameres {
- struct nfs_fattr * fromattr;
- struct nfs_fattr * toattr;
-};
-
struct nfs3_linkres {
struct nfs_fattr * dir_attr;
struct nfs_fattr * fattr;
@@ -795,15 +799,6 @@ struct nfs4_readlink_res {
struct nfs4_sequence_res seq_res;
};
-struct nfs4_rename_res {
- const struct nfs_server * server;
- struct nfs4_change_info old_cinfo;
- struct nfs_fattr * old_fattr;
- struct nfs4_change_info new_cinfo;
- struct nfs_fattr * new_fattr;
- struct nfs4_sequence_res seq_res;
-};
-
#define NFS4_SETCLIENTID_NAMELEN (127)
struct nfs4_setclientid {
const nfs4_verifier * sc_verifier;