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 /fs/nfs | |
parent | 2b484297e48c3fbb1846fc6ea10036d9465273e7 (diff) |
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 'fs/nfs')
-rw-r--r-- | fs/nfs/nfs2xdr.c | 8 | ||||
-rw-r--r-- | fs/nfs/nfs3proc.c | 12 | ||||
-rw-r--r-- | fs/nfs/nfs3xdr.c | 10 | ||||
-rw-r--r-- | fs/nfs/nfs4proc.c | 2 | ||||
-rw-r--r-- | fs/nfs/nfs4xdr.c | 2 | ||||
-rw-r--r-- | fs/nfs/proc.c | 10 |
6 files changed, 20 insertions, 24 deletions
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c index db8846a0e82e..e15bc0306d0c 100644 --- a/fs/nfs/nfs2xdr.c +++ b/fs/nfs/nfs2xdr.c | |||
@@ -337,10 +337,10 @@ nfs_xdr_createargs(struct rpc_rqst *req, __be32 *p, struct nfs_createargs *args) | |||
337 | static int | 337 | static int |
338 | nfs_xdr_renameargs(struct rpc_rqst *req, __be32 *p, struct nfs_renameargs *args) | 338 | nfs_xdr_renameargs(struct rpc_rqst *req, __be32 *p, struct nfs_renameargs *args) |
339 | { | 339 | { |
340 | p = xdr_encode_fhandle(p, args->fromfh); | 340 | p = xdr_encode_fhandle(p, args->old_dir); |
341 | p = xdr_encode_array(p, args->fromname, args->fromlen); | 341 | p = xdr_encode_array(p, args->old_name->name, args->old_name->len); |
342 | p = xdr_encode_fhandle(p, args->tofh); | 342 | p = xdr_encode_fhandle(p, args->new_dir); |
343 | p = xdr_encode_array(p, args->toname, args->tolen); | 343 | p = xdr_encode_array(p, args->new_name->name, args->new_name->len); |
344 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 344 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); |
345 | return 0; | 345 | return 0; |
346 | } | 346 | } |
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 2be4a7f59f1c..6dc4ef66f074 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c | |||
@@ -442,13 +442,11 @@ static int | |||
442 | nfs3_proc_rename(struct inode *old_dir, struct qstr *old_name, | 442 | nfs3_proc_rename(struct inode *old_dir, struct qstr *old_name, |
443 | struct inode *new_dir, struct qstr *new_name) | 443 | struct inode *new_dir, struct qstr *new_name) |
444 | { | 444 | { |
445 | struct nfs3_renameargs arg = { | 445 | struct nfs_renameargs arg = { |
446 | .fromfh = NFS_FH(old_dir), | 446 | .old_dir = NFS_FH(old_dir), |
447 | .fromname = old_name->name, | 447 | .old_name = old_name, |
448 | .fromlen = old_name->len, | 448 | .new_dir = NFS_FH(new_dir), |
449 | .tofh = NFS_FH(new_dir), | 449 | .new_name = new_name, |
450 | .toname = new_name->name, | ||
451 | .tolen = new_name->len | ||
452 | }; | 450 | }; |
453 | struct nfs3_renameres res; | 451 | struct nfs3_renameres res; |
454 | struct rpc_message msg = { | 452 | struct rpc_message msg = { |
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index 9769704f8ce6..f385759eb35b 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c | |||
@@ -442,12 +442,12 @@ nfs3_xdr_mknodargs(struct rpc_rqst *req, __be32 *p, struct nfs3_mknodargs *args) | |||
442 | * Encode RENAME arguments | 442 | * Encode RENAME arguments |
443 | */ | 443 | */ |
444 | static int | 444 | static int |
445 | nfs3_xdr_renameargs(struct rpc_rqst *req, __be32 *p, struct nfs3_renameargs *args) | 445 | nfs3_xdr_renameargs(struct rpc_rqst *req, __be32 *p, struct nfs_renameargs *args) |
446 | { | 446 | { |
447 | p = xdr_encode_fhandle(p, args->fromfh); | 447 | p = xdr_encode_fhandle(p, args->old_dir); |
448 | p = xdr_encode_array(p, args->fromname, args->fromlen); | 448 | p = xdr_encode_array(p, args->old_name->name, args->old_name->len); |
449 | p = xdr_encode_fhandle(p, args->tofh); | 449 | p = xdr_encode_fhandle(p, args->new_dir); |
450 | p = xdr_encode_array(p, args->toname, args->tolen); | 450 | p = xdr_encode_array(p, args->new_name->name, args->new_name->len); |
451 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 451 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); |
452 | return 0; | 452 | return 0; |
453 | } | 453 | } |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 643abd26f2de..3aa13c1b8dd8 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -2570,7 +2570,7 @@ static int _nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, | |||
2570 | struct inode *new_dir, struct qstr *new_name) | 2570 | struct inode *new_dir, struct qstr *new_name) |
2571 | { | 2571 | { |
2572 | struct nfs_server *server = NFS_SERVER(old_dir); | 2572 | struct nfs_server *server = NFS_SERVER(old_dir); |
2573 | struct nfs4_rename_arg arg = { | 2573 | struct nfs_renameargs arg = { |
2574 | .old_dir = NFS_FH(old_dir), | 2574 | .old_dir = NFS_FH(old_dir), |
2575 | .new_dir = NFS_FH(new_dir), | 2575 | .new_dir = NFS_FH(new_dir), |
2576 | .old_name = old_name, | 2576 | .old_name = old_name, |
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 08ef91291132..7a098ae07a1b 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -1823,7 +1823,7 @@ static int nfs4_xdr_enc_remove(struct rpc_rqst *req, __be32 *p, const struct nfs | |||
1823 | /* | 1823 | /* |
1824 | * Encode RENAME request | 1824 | * Encode RENAME request |
1825 | */ | 1825 | */ |
1826 | static int nfs4_xdr_enc_rename(struct rpc_rqst *req, __be32 *p, const struct nfs4_rename_arg *args) | 1826 | static int nfs4_xdr_enc_rename(struct rpc_rqst *req, __be32 *p, const struct nfs_renameargs *args) |
1827 | { | 1827 | { |
1828 | struct xdr_stream xdr; | 1828 | struct xdr_stream xdr; |
1829 | struct compound_hdr hdr = { | 1829 | struct compound_hdr hdr = { |
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index 4ef39ae88ea5..0aff10c3bbce 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c | |||
@@ -370,12 +370,10 @@ nfs_proc_rename(struct inode *old_dir, struct qstr *old_name, | |||
370 | struct inode *new_dir, struct qstr *new_name) | 370 | struct inode *new_dir, struct qstr *new_name) |
371 | { | 371 | { |
372 | struct nfs_renameargs arg = { | 372 | struct nfs_renameargs arg = { |
373 | .fromfh = NFS_FH(old_dir), | 373 | .old_dir = NFS_FH(old_dir), |
374 | .fromname = old_name->name, | 374 | .old_name = old_name, |
375 | .fromlen = old_name->len, | 375 | .new_dir = NFS_FH(new_dir), |
376 | .tofh = NFS_FH(new_dir), | 376 | .new_name = new_name, |
377 | .toname = new_name->name, | ||
378 | .tolen = new_name->len | ||
379 | }; | 377 | }; |
380 | struct rpc_message msg = { | 378 | struct rpc_message msg = { |
381 | .rpc_proc = &nfs_procedures[NFSPROC_RENAME], | 379 | .rpc_proc = &nfs_procedures[NFSPROC_RENAME], |