Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8582a8b authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

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: default avatarJeff Layton <jlayton@redhat.com>
Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 920769f0

fs/nfs/nfs3proc.c

+8 −8
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ nfs3_proc_rename(struct inode *old_dir, struct qstr *old_name, 
		.new_dir	= NFS_FH(new_dir),

		.new_name	= new_name,

	};

	struct nfs3_renameres res;

	struct nfs_renameres res;

	struct rpc_message msg = {

		.rpc_proc	= &nfs3_procedures[NFS3PROC_RENAME],

		.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);



	res.fromattr = nfs_alloc_fattr();

	res.toattr = nfs_alloc_fattr();

	if (res.fromattr == NULL || res.toattr == NULL)

	res.old_fattr = nfs_alloc_fattr();

	res.new_fattr = nfs_alloc_fattr();

	if (res.old_fattr == NULL || res.new_fattr == NULL)

		goto out;



	status = rpc_call_sync(NFS_CLIENT(old_dir), &msg, 0);

	nfs_post_op_update_inode(old_dir, res.fromattr);

	nfs_post_op_update_inode(new_dir, res.toattr);

	nfs_post_op_update_inode(old_dir, res.old_fattr);

	nfs_post_op_update_inode(new_dir, res.new_fattr);

out:

	nfs_free_fattr(res.toattr);

	nfs_free_fattr(res.fromattr);

	nfs_free_fattr(res.old_fattr);

	nfs_free_fattr(res.new_fattr);

	dprintk("NFS reply rename: %d\n", status);

	return status;

}

fs/nfs/nfs3xdr.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -2577,7 +2577,7 @@ static int _nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, 
		.new_name = new_name,

		.bitmask = server->attr_bitmask,

	};

	struct nfs4_rename_res res = {

	struct nfs_renameres res = {

		.server = server,

	};

	struct rpc_message msg = {

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -4873,7 +4873,7 @@ static int nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, __be32 *p, struct nfs_rem 
/*

 * 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 compound_hdr hdr;

include/linux/nfs_xdr.h

+9 −14
Original line number Diff line number Diff line
@@ -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;