NFSv4: Add post-op attributes to nfs4_proc_rename() (6caf2c82) · Commits · 戴 / test

fs/nfs/nfs4proc.c

+13 −2

Original line number	Diff line number	Diff line
		@@ -1685,13 +1685,20 @@ static int nfs4_proc_unlink_done(struct dentry dir, struct rpc_task task)
		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 = {
		.old_dir = NFS_FH(old_dir),
		.new_dir = NFS_FH(new_dir),
		.old_name = old_name,
		.new_name = new_name,
		.bitmask = server->attr_bitmask,
		};
		struct nfs_fattr old_fattr, new_fattr;
		struct nfs4_rename_res res = {
		.server = server,
		.old_fattr = &old_fattr,
		.new_fattr = &new_fattr,
		};
		struct nfs4_rename_res res = { };
		struct rpc_message msg = {
		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENAME],
		.rpc_argp = &arg,
		@@ -1699,11 +1706,15 @@ static int _nfs4_proc_rename(struct inode old_dir, struct qstr old_name,
		};
		int status;

		status = rpc_call_sync(NFS_CLIENT(old_dir), &msg, 0);
		nfs_fattr_init(res.old_fattr);
		nfs_fattr_init(res.new_fattr);
		status = rpc_call_sync(server->client, &msg, 0);

		if (!status) {
		update_changeattr(old_dir, &res.old_cinfo);
		nfs_post_op_update_inode(old_dir, res.old_fattr);
		update_changeattr(new_dir, &res.new_cinfo);
		nfs_post_op_update_inode(new_dir, res.new_fattr);
		}
		return status;
		}

fs/nfs/nfs4xdr.c

+24 −5

Original line number	Diff line number	Diff line
		@@ -314,12 +314,18 @@ static int nfs_stat_to_errno(int);
		encode_putfh_maxsz + \
		encode_savefh_maxsz + \
		encode_putfh_maxsz + \
		encode_rename_maxsz)
		encode_rename_maxsz + \
		encode_getattr_maxsz + \
		encode_restorefh_maxsz + \
		encode_getattr_maxsz)
		#define NFS4_dec_rename_sz (compound_decode_hdr_maxsz + \
		decode_putfh_maxsz + \
		decode_savefh_maxsz + \
		decode_putfh_maxsz + \
		decode_rename_maxsz)
		decode_rename_maxsz + \
		decode_getattr_maxsz + \
		decode_restorefh_maxsz + \
		decode_getattr_maxsz)
		#define NFS4_enc_link_sz (compound_encode_hdr_maxsz + \
		encode_putfh_maxsz + \
		encode_savefh_maxsz + \
		@@ -1339,7 +1345,7 @@ static int nfs4_xdr_enc_rename(struct rpc_rqst req, uint32_t p, const struct n
		{
		struct xdr_stream xdr;
		struct compound_hdr hdr = {
		.nops = 4,
		.nops = 7,
		};
		int status;

		@@ -1351,7 +1357,13 @@ static int nfs4_xdr_enc_rename(struct rpc_rqst req, uint32_t p, const struct n
		goto out;
		if ((status = encode_putfh(&xdr, args->new_dir)) != 0)
		goto out;
		status = encode_rename(&xdr, args->old_name, args->new_name);
		if ((status = encode_rename(&xdr, args->old_name, args->new_name)) != 0)
		goto out;
		if ((status = encode_getfattr(&xdr, args->bitmask)) != 0)
		goto out;
		if ((status = encode_restorefh(&xdr)) != 0)
		goto out;
		status = encode_getfattr(&xdr, args->bitmask);
		out:
		return status;
		}
		@@ -3533,7 +3545,14 @@ static int nfs4_xdr_dec_rename(struct rpc_rqst rqstp, uint32_t p, struct nfs4_
		goto out;
		if ((status = decode_putfh(&xdr)) != 0)
		goto out;
		status = decode_rename(&xdr, &res->old_cinfo, &res->new_cinfo);
		if ((status = decode_rename(&xdr, &res->old_cinfo, &res->new_cinfo)) != 0)
		goto out;
		/* Current FH is target directory */
		if (decode_getfattr(&xdr, res->new_fattr, res->server) != 0)
		goto out;
		if ((status = decode_restorefh(&xdr)) != 0)
		goto out;
		decode_getfattr(&xdr, res->old_fattr, res->server);
		out:
		return status;
		}

include/linux/nfs_xdr.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -630,11 +630,15 @@ struct nfs4_rename_arg {
		const struct nfs_fh * new_dir;
		const struct qstr * old_name;
		const struct qstr * new_name;
		const u32 * bitmask;
		};

		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_setclientid {

Admin message