diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-09-17 17:30:25 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-09-17 17:30:25 -0400 |
| commit | 920769f031a8aff87b66bdf49d1a0d0988241ef9 (patch) | |
| tree | e7a3ecc1ceedabd8559de8235be7b2509abf891b /include | |
| parent | 2b484297e48c3fbb1846fc6ea10036d9465273e7 (diff) | |
| download | kernel_samsung_tuna-920769f031a8aff87b66bdf49d1a0d0988241ef9.zip kernel_samsung_tuna-920769f031a8aff87b66bdf49d1a0d0988241ef9.tar.gz kernel_samsung_tuna-920769f031a8aff87b66bdf49d1a0d0988241ef9.tar.bz2 | |
nfs: standardize the rename args container
Each NFS version has its own version of the rename args container.
Standardize them on a common one that's identical to the one NFSv4
uses.
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')
| -rw-r--r-- | include/linux/nfs_xdr.h | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 6f345f8..acb95fb 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -400,6 +400,18 @@ struct nfs_removeres { }; /* + * Common arguments to the rename call + */ +struct nfs_renameargs { + const struct nfs_fh *old_dir; + const struct nfs_fh *new_dir; + const struct qstr *old_name; + const struct qstr *new_name; + const u32 *bitmask; + struct nfs4_sequence_args seq_args; +}; + +/* * Argument struct for decode_entry function */ struct nfs_entry { @@ -434,15 +446,6 @@ struct nfs_createargs { struct iattr * sattr; }; -struct nfs_renameargs { - struct nfs_fh * fromfh; - const char * fromname; - unsigned int fromlen; - struct nfs_fh * tofh; - const char * toname; - unsigned int tolen; -}; - struct nfs_setattrargs { struct nfs_fh * fh; nfs4_stateid stateid; @@ -586,15 +589,6 @@ struct nfs3_mknodargs { dev_t rdev; }; -struct nfs3_renameargs { - struct nfs_fh * fromfh; - const char * fromname; - unsigned int fromlen; - struct nfs_fh * tofh; - const char * toname; - unsigned int tolen; -}; - struct nfs3_linkargs { struct nfs_fh * fromfh; struct nfs_fh * tofh; @@ -801,15 +795,6 @@ struct nfs4_readlink_res { struct nfs4_sequence_res seq_res; }; -struct nfs4_rename_arg { - const struct nfs_fh * old_dir; - const struct nfs_fh * new_dir; - const struct qstr * old_name; - const struct qstr * new_name; - const u32 * bitmask; - struct nfs4_sequence_args seq_args; -}; - struct nfs4_rename_res { const struct nfs_server * server; struct nfs4_change_info old_cinfo; |