lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfs: standardize the rename response container

Browse Source 
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>
This commit is contained in:
Jeff Layton
2010-09-17 17:31:06 -04:00
committed by Trond Myklebust
parent 920769f031
commit e8582a8b96
5 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/nfs/nfs3proc.c
View File

@@ -448,7 +448,7 @@ nfs3_proc_rename(struct inode *old_dir, struct qstr *old_name,
.new_dir = NFS_FH(new_dir), .new_dir = NFS_FH(new_dir),
.new_name = new_name, .new_name = new_name,
}; };
struct nfs3_renameres res; struct nfs_renameres res;
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs3_procedures[NFS3PROC_RENAME], .rpc_proc = &nfs3_procedures[NFS3PROC_RENAME],
.rpc_argp = &arg, .rpc_argp = &arg,
@@ -458,17 +458,17 @@ nfs3_proc_rename(struct inode *old_dir, struct qstr *old_name,
dprintk("NFS call rename %s -> %s\n", old_name->name, new_name->name); dprintk("NFS call rename %s -> %s\n", old_name->name, new_name->name);
res.fromattr = nfs_alloc_fattr(); res.old_fattr = nfs_alloc_fattr();
res.toattr = nfs_alloc_fattr(); res.new_fattr = nfs_alloc_fattr();
if (res.fromattr == NULL || res.toattr == NULL) if (res.old_fattr == NULL || res.new_fattr == NULL)
goto out; goto out;
status = rpc_call_sync(NFS_CLIENT(old_dir), &msg, 0); status = rpc_call_sync(NFS_CLIENT(old_dir), &msg, 0);
nfs_post_op_update_inode(old_dir, res.fromattr); nfs_post_op_update_inode(old_dir, res.old_fattr);
nfs_post_op_update_inode(new_dir, res.toattr); nfs_post_op_update_inode(new_dir, res.new_fattr);
out: out:
nfs_free_fattr(res.toattr); nfs_free_fattr(res.old_fattr);
nfs_free_fattr(res.fromattr); nfs_free_fattr(res.new_fattr);
dprintk("NFS reply rename: %d\n", status); dprintk("NFS reply rename: %d\n", status);
return status; return status;
} }

6
fs/nfs/nfs3xdr.c
View File

@@ -970,14 +970,14 @@ nfs3_xdr_createres(struct rpc_rqst *req, __be32 *p, struct nfs3_diropres *res)
* Decode RENAME reply * Decode RENAME reply
*/ */
static int 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; int status;
if ((status = ntohl(*p++)) != 0) if ((status = ntohl(*p++)) != 0)
status = nfs_stat_to_errno(status); status = nfs_stat_to_errno(status);
p = xdr_decode_wcc_data(p, res->fromattr); p = xdr_decode_wcc_data(p, res->old_fattr);
p = xdr_decode_wcc_data(p, res->toattr); p = xdr_decode_wcc_data(p, res->new_fattr);
return status; return status;
} }

2
fs/nfs/nfs4proc.c
View File

@@ -2577,7 +2577,7 @@ static int _nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
.new_name = new_name, .new_name = new_name,
.bitmask = server->attr_bitmask, .bitmask = server->attr_bitmask,
}; };
struct nfs4_rename_res res = { struct nfs_renameres res = {
.server = server, .server = server,
}; };
struct rpc_message msg = { struct rpc_message msg = {

2
fs/nfs/nfs4xdr.c
View File

@@ -4873,7 +4873,7 @@ out:
/* /*
* Decode RENAME response * Decode RENAME response
*/ */
static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_rename_res *res) static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, __be32 *p, struct nfs_renameres *res)
{ {
struct xdr_stream xdr; struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;

23
include/linux/nfs_xdr.h
View File

@@ -411,6 +411,15 @@ struct nfs_renameargs {
struct nfs4_sequence_args seq_args; 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 * Argument struct for decode_entry function
*/ */
@@ -623,11 +632,6 @@ struct nfs3_readlinkargs {
struct page ** pages; struct page ** pages;
}; };
struct nfs3_renameres {
struct nfs_fattr * fromattr;
struct nfs_fattr * toattr;
};
struct nfs3_linkres { struct nfs3_linkres {
struct nfs_fattr * dir_attr; struct nfs_fattr * dir_attr;
struct nfs_fattr * fattr; struct nfs_fattr * fattr;
@@ -795,15 +799,6 @@ struct nfs4_readlink_res {
struct nfs4_sequence_res seq_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) #define NFS4_SETCLIENTID_NAMELEN (127)
struct nfs4_setclientid { struct nfs4_setclientid {
const nfs4_verifier * sc_verifier; const nfs4_verifier * sc_verifier;