Commit 56ae19f3 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Add directory post-op attributes to the CREATE operations. 



 Since the directory attributes change every time we CREATE a file,
 we might as well pick up the new directory attributes in the same
 compound.

 Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 0c70b501

fs/nfs/nfs4proc.c

+23 −5
Original line number Diff line number Diff line
@@ -443,7 +443,11 @@ static int _nfs4_proc_open(struct inode *dir, struct nfs4_state_owner *sp, stru 
	nfs_increment_open_seqid(status, o_arg->seqid);

	if (status != 0)

		goto out;

	if (o_arg->open_flags & O_CREAT) {

		update_changeattr(dir, &o_res->cinfo);

		nfs_post_op_update_inode(dir, o_res->dir_attr);

	} else

		nfs_refresh_inode(dir, o_res->dir_attr);

	if(o_res->rflags & NFS4_OPEN_RESULT_CONFIRM) {

		status = _nfs4_proc_open_confirm(server->client, &o_res->fh,

				sp, &o_res->stateid, o_arg->seqid);
@@ -497,7 +501,7 @@ static int _nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st 
	struct inode *inode = state->inode;

	struct nfs_server *server = NFS_SERVER(dir);

	struct nfs_delegation *delegation = NFS_I(inode)->delegation;

	struct nfs_fattr        f_attr;

	struct nfs_fattr f_attr, dir_attr;

	struct nfs_openargs o_arg = {

		.fh = NFS_FH(dir),

		.open_flags = state->state,
@@ -507,6 +511,7 @@ static int _nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st 
	};

	struct nfs_openres o_res = {

		.f_attr = &f_attr,

		.dir_attr = &dir_attr,

		.server = server,

	};

	int status = 0;
@@ -524,6 +529,7 @@ static int _nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st 
	if (o_arg.seqid == NULL)

		goto out;

	nfs_fattr_init(&f_attr);

	nfs_fattr_init(&dir_attr);

	status = _nfs4_proc_open(dir, sp, &o_arg, &o_res);

	if (status != 0)

		goto out_nodeleg;
@@ -694,7 +700,7 @@ static int _nfs4_do_open(struct inode *dir, struct dentry *dentry, int flags, st 
	struct nfs4_client *clp = server->nfs4_state;

	struct inode *inode = NULL;

	int                     status;

	struct nfs_fattr        f_attr;

	struct nfs_fattr f_attr, dir_attr;

	struct nfs_openargs o_arg = {

		.fh             = NFS_FH(dir),

		.open_flags	= flags,
@@ -705,6 +711,7 @@ static int _nfs4_do_open(struct inode *dir, struct dentry *dentry, int flags, st 
	};

	struct nfs_openres o_res = {

		.f_attr         = &f_attr,

		.dir_attr	= &dir_attr,

		.server         = server,

	};
@@ -727,6 +734,7 @@ static int _nfs4_do_open(struct inode *dir, struct dentry *dentry, int flags, st 
	if (o_arg.seqid == NULL)

		return -ENOMEM;

	nfs_fattr_init(&f_attr);

	nfs_fattr_init(&dir_attr);

	status = _nfs4_proc_open(dir, sp, &o_arg, &o_res);

	if (status != 0)

		goto out_err;
@@ -1746,6 +1754,7 @@ static int _nfs4_proc_symlink(struct inode *dir, struct qstr *name, 
		struct nfs_fattr *fattr)

{

	struct nfs_server *server = NFS_SERVER(dir);

	struct nfs_fattr dir_fattr;

	struct nfs4_create_arg arg = {

		.dir_fh = NFS_FH(dir),

		.server = server,
@@ -1758,6 +1767,7 @@ static int _nfs4_proc_symlink(struct inode *dir, struct qstr *name, 
		.server = server,

		.fh = fhandle,

		.fattr = fattr,

		.dir_fattr = &dir_fattr,

	};

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SYMLINK],
@@ -1770,10 +1780,12 @@ static int _nfs4_proc_symlink(struct inode *dir, struct qstr *name, 
		return -ENAMETOOLONG;

	arg.u.symlink = path;

	nfs_fattr_init(fattr);

	nfs_fattr_init(&dir_fattr);

	

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

	if (!status)

		update_changeattr(dir, &res.dir_cinfo);

	nfs_post_op_update_inode(dir, res.dir_fattr);

	return status;

}
@@ -1797,7 +1809,7 @@ static int _nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, 
{

	struct nfs_server *server = NFS_SERVER(dir);

	struct nfs_fh fhandle;

	struct nfs_fattr fattr;

	struct nfs_fattr fattr, dir_fattr;

	struct nfs4_create_arg arg = {

		.dir_fh = NFS_FH(dir),

		.server = server,
@@ -1810,6 +1822,7 @@ static int _nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, 
		.server = server,

		.fh = &fhandle,

		.fattr = &fattr,

		.dir_fattr = &dir_fattr,

	};

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CREATE],
@@ -1819,10 +1832,12 @@ static int _nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, 
	int			status;



	nfs_fattr_init(&fattr);

	nfs_fattr_init(&dir_fattr);

	

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

	if (!status) {

		update_changeattr(dir, &res.dir_cinfo);

		nfs_post_op_update_inode(dir, res.dir_fattr);

		status = nfs_instantiate(dentry, &fhandle, &fattr);

	}

	return status;
@@ -1895,7 +1910,7 @@ static int _nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, 
{

	struct nfs_server *server = NFS_SERVER(dir);

	struct nfs_fh fh;

	struct nfs_fattr fattr;

	struct nfs_fattr fattr, dir_fattr;

	struct nfs4_create_arg arg = {

		.dir_fh = NFS_FH(dir),

		.server = server,
@@ -1907,6 +1922,7 @@ static int _nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, 
		.server = server,

		.fh = &fh,

		.fattr = &fattr,

		.dir_fattr = &dir_fattr,

	};

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CREATE],
@@ -1917,6 +1933,7 @@ static int _nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, 
	int                     mode = sattr->ia_mode;



	nfs_fattr_init(&fattr);

	nfs_fattr_init(&dir_fattr);



	BUG_ON(!(sattr->ia_valid & ATTR_MODE));

	BUG_ON(!S_ISFIFO(mode) && !S_ISBLK(mode) && !S_ISCHR(mode) && !S_ISSOCK(mode));
@@ -1938,6 +1955,7 @@ static int _nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, 
	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);

	if (status == 0) {

		update_changeattr(dir, &res.dir_cinfo);

		nfs_post_op_update_inode(dir, res.dir_fattr);

		status = nfs_instantiate(dentry, &fh, &fattr);

	}

	return status;

fs/nfs/nfs4xdr.c

+59 −10
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ static int nfs_stat_to_errno(int); 
#define decode_getattr_maxsz    (op_decode_hdr_maxsz + nfs4_fattr_maxsz)

#define encode_savefh_maxsz     (op_encode_hdr_maxsz)

#define decode_savefh_maxsz     (op_decode_hdr_maxsz)

#define encode_restorefh_maxsz  (op_encode_hdr_maxsz)

#define decode_restorefh_maxsz  (op_decode_hdr_maxsz)

#define encode_fsinfo_maxsz	(op_encode_hdr_maxsz + 2)

#define decode_fsinfo_maxsz	(op_decode_hdr_maxsz + 11)

#define encode_renew_maxsz	(op_encode_hdr_maxsz + 3)
@@ -336,14 +338,20 @@ static int nfs_stat_to_errno(int); 
				decode_getfh_maxsz)

#define NFS4_enc_create_sz	(compound_encode_hdr_maxsz + \

				encode_putfh_maxsz + \

				encode_savefh_maxsz + \

				encode_create_maxsz + \

				encode_getfh_maxsz + \

				encode_getattr_maxsz + \

				encode_getfh_maxsz)

				encode_restorefh_maxsz + \

				encode_getattr_maxsz)

#define NFS4_dec_create_sz	(compound_decode_hdr_maxsz + \

				decode_putfh_maxsz + \

				decode_savefh_maxsz + \

				decode_create_maxsz + \

				decode_getfh_maxsz + \

				decode_getattr_maxsz + \

				decode_getfh_maxsz)

				decode_restorefh_maxsz + \

				decode_getattr_maxsz)

#define NFS4_enc_pathconf_sz	(compound_encode_hdr_maxsz + \

				encode_putfh_maxsz + \

				encode_getattr_maxsz)
@@ -1112,6 +1120,17 @@ static int encode_renew(struct xdr_stream *xdr, const struct nfs4_client *client 
	return 0;

}



static int

encode_restorefh(struct xdr_stream *xdr)

{

	uint32_t *p;



	RESERVE_SPACE(4);

	WRITE32(OP_RESTOREFH);



	return 0;

}



static int

encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg)

{
@@ -1358,7 +1377,7 @@ static int nfs4_xdr_enc_create(struct rpc_rqst *req, uint32_t *p, const struct n 
{

	struct xdr_stream xdr;

	struct compound_hdr hdr = {

		.nops = 4,

		.nops = 7,

	};

	int status;
@@ -1366,10 +1385,16 @@ static int nfs4_xdr_enc_create(struct rpc_rqst *req, uint32_t *p, const struct n 
	encode_compound_hdr(&xdr, &hdr);

	if ((status = encode_putfh(&xdr, args->dir_fh)) != 0)

		goto out;

	if ((status = encode_savefh(&xdr)) != 0)

		goto out;

	if ((status = encode_create(&xdr, args)) != 0)

		goto out;

	if ((status = encode_getfh(&xdr)) != 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;
@@ -1429,7 +1454,7 @@ static int nfs4_xdr_enc_open(struct rpc_rqst *req, uint32_t *p, struct nfs_opena 
{

	struct xdr_stream xdr;

	struct compound_hdr hdr = {

		.nops = 4,

		.nops = 7,

	};

	int status;
@@ -1439,6 +1464,9 @@ static int nfs4_xdr_enc_open(struct rpc_rqst *req, uint32_t *p, struct nfs_opena 
	xdr_init_encode(&xdr, &req->rq_snd_buf, p);

	encode_compound_hdr(&xdr, &hdr);

	status = encode_putfh(&xdr, args->fh);

	if (status)

		goto out;

	status = encode_savefh(&xdr);

	if (status)

		goto out;

	status = encode_open(&xdr, args);
@@ -1448,6 +1476,12 @@ static int nfs4_xdr_enc_open(struct rpc_rqst *req, uint32_t *p, struct nfs_opena 
	if (status)

		goto out;

	status = encode_getfattr(&xdr, args->bitmask);

	if (status)

		goto out;

	status = encode_restorefh(&xdr);

	if (status)

		goto out;

	status = encode_getfattr(&xdr, args->bitmask);

out:

	return status;

}
@@ -3218,6 +3252,12 @@ static int decode_renew(struct xdr_stream *xdr) 
	return decode_op_hdr(xdr, OP_RENEW);

}



static int

decode_restorefh(struct xdr_stream *xdr)

{

	return decode_op_hdr(xdr, OP_RESTOREFH);

}



static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,

		size_t *acl_len)

{
@@ -3510,13 +3550,17 @@ static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_ 
		goto out;

	if ((status = decode_putfh(&xdr)) != 0)

		goto out;

	if ((status = decode_savefh(&xdr)) != 0)

		goto out;

	if ((status = decode_create(&xdr,&res->dir_cinfo)) != 0)

		goto out;

	if ((status = decode_getfh(&xdr, res->fh)) != 0)

		goto out;

	status = decode_getfattr(&xdr, res->fattr, res->server);

	if (status == NFS4ERR_DELAY)

		status = 0;

	if (decode_getfattr(&xdr, res->fattr, res->server) != 0)

		goto out;

	if ((status = decode_restorefh(&xdr)) != 0)

		goto out;

	decode_getfattr(&xdr, res->dir_fattr, res->server);

out:

	return status;

}
@@ -3652,6 +3696,9 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_ope 
        if (status)

                goto out;

        status = decode_putfh(&xdr);

        if (status)

                goto out;

        status = decode_savefh(&xdr);

	if (status)

		goto out;

        status = decode_open(&xdr, res);
@@ -3660,9 +3707,11 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_ope 
	status = decode_getfh(&xdr, &res->fh);

        if (status)

		goto out;

	status = decode_getfattr(&xdr, res->f_attr, res->server);

	if (status == NFS4ERR_DELAY)

		status = 0;

	if (decode_getfattr(&xdr, res->f_attr, res->server) != 0)

		goto out;

	if ((status = decode_restorefh(&xdr)) != 0)

		goto out;

	decode_getfattr(&xdr, res->dir_attr, res->server);

out:

        return status;

}

include/linux/nfs_xdr.h

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ struct nfs_openres { 
	struct nfs4_change_info	cinfo;

	__u32                   rflags;

	struct nfs_fattr *      f_attr;

	struct nfs_fattr *      dir_attr;

	const struct nfs_server *server;

	int			delegation_type;

	nfs4_stateid		delegation;
@@ -540,6 +541,7 @@ struct nfs4_create_res { 
	struct nfs_fh *			fh;

	struct nfs_fattr *		fattr;

	struct nfs4_change_info		dir_cinfo;

	struct nfs_fattr *		dir_fattr;

};



struct nfs4_fsinfo_arg {