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

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: 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 2b484297

fs/nfs/nfs2xdr.c

+4 −4
Original line number Diff line number Diff line
@@ -337,10 +337,10 @@ nfs_xdr_createargs(struct rpc_rqst *req, __be32 *p, struct nfs_createargs *args) 
static int

nfs_xdr_renameargs(struct rpc_rqst *req, __be32 *p, struct nfs_renameargs *args)

{

	p = xdr_encode_fhandle(p, args->fromfh);

	p = xdr_encode_array(p, args->fromname, args->fromlen);

	p = xdr_encode_fhandle(p, args->tofh);

	p = xdr_encode_array(p, args->toname, args->tolen);

	p = xdr_encode_fhandle(p, args->old_dir);

	p = xdr_encode_array(p, args->old_name->name, args->old_name->len);

	p = xdr_encode_fhandle(p, args->new_dir);

	p = xdr_encode_array(p, args->new_name->name, args->new_name->len);

	req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);

	return 0;

}

fs/nfs/nfs3proc.c

+5 −7
Original line number Diff line number Diff line
@@ -442,13 +442,11 @@ static int 
nfs3_proc_rename(struct inode *old_dir, struct qstr *old_name,

		 struct inode *new_dir, struct qstr *new_name)

{

	struct nfs3_renameargs	arg = {

		.fromfh		= NFS_FH(old_dir),

		.fromname	= old_name->name,

		.fromlen	= old_name->len,

		.tofh		= NFS_FH(new_dir),

		.toname		= new_name->name,

		.tolen		= new_name->len

	struct nfs_renameargs	arg = {

		.old_dir	= NFS_FH(old_dir),

		.old_name	= old_name,

		.new_dir	= NFS_FH(new_dir),

		.new_name	= new_name,

	};

	struct nfs3_renameres res;

	struct rpc_message msg = {

fs/nfs/nfs3xdr.c

+5 −5
Original line number Diff line number Diff line
@@ -442,12 +442,12 @@ nfs3_xdr_mknodargs(struct rpc_rqst *req, __be32 *p, struct nfs3_mknodargs *args) 
 * Encode RENAME arguments

 */

static int

nfs3_xdr_renameargs(struct rpc_rqst *req, __be32 *p, struct nfs3_renameargs *args)

nfs3_xdr_renameargs(struct rpc_rqst *req, __be32 *p, struct nfs_renameargs *args)

{

	p = xdr_encode_fhandle(p, args->fromfh);

	p = xdr_encode_array(p, args->fromname, args->fromlen);

	p = xdr_encode_fhandle(p, args->tofh);

	p = xdr_encode_array(p, args->toname, args->tolen);

	p = xdr_encode_fhandle(p, args->old_dir);

	p = xdr_encode_array(p, args->old_name->name, args->old_name->len);

	p = xdr_encode_fhandle(p, args->new_dir);

	p = xdr_encode_array(p, args->new_name->name, args->new_name->len);

	req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);

	return 0;

}

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -2570,7 +2570,7 @@ static int _nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, 
		struct inode *new_dir, struct qstr *new_name)

{

	struct nfs_server *server = NFS_SERVER(old_dir);

	struct nfs4_rename_arg arg = {

	struct nfs_renameargs arg = {

		.old_dir = NFS_FH(old_dir),

		.new_dir = NFS_FH(new_dir),

		.old_name = old_name,

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -1823,7 +1823,7 @@ static int nfs4_xdr_enc_remove(struct rpc_rqst *req, __be32 *p, const struct nfs 
/*

 * Encode RENAME request

 */

static int nfs4_xdr_enc_rename(struct rpc_rqst *req, __be32 *p, const struct nfs4_rename_arg *args)

static int nfs4_xdr_enc_rename(struct rpc_rqst *req, __be32 *p, const struct nfs_renameargs *args)

{

	struct xdr_stream xdr;

	struct compound_hdr hdr = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE