Commit 8582715e authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: COMMIT does not need post-op attributes 



No attributes are supposed to change during a COMMIT call, so there
is no need to request post-op attributes.

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

fs/nfs/nfs4proc.c

+0 −6
Original line number Diff line number Diff line
@@ -3462,7 +3462,6 @@ static int nfs4_commit_done_cb(struct rpc_task *task, struct nfs_commit_data *da 
		rpc_restart_call_prepare(task);

		return -EAGAIN;

	}

	nfs_refresh_inode(inode, data->res.fattr);

	return 0;

}
@@ -3477,11 +3476,6 @@ static void nfs4_proc_commit_setup(struct nfs_commit_data *data, struct rpc_mess 
{

	struct nfs_server *server = NFS_SERVER(data->inode);



	if (data->lseg) {

		data->args.bitmask = NULL;

		data->res.fattr = NULL;

	} else

		data->args.bitmask = server->cache_consistency_bitmask;

	if (data->commit_done_cb == NULL)

		data->commit_done_cb = nfs4_commit_done_cb;

	data->res.server = server;

fs/nfs/nfs4xdr.c

+2 −10
Original line number Diff line number Diff line
@@ -421,13 +421,11 @@ static int nfs4_stat_to_errno(int); 
#define NFS4_enc_commit_sz	(compound_encode_hdr_maxsz + \

				encode_sequence_maxsz + \

				encode_putfh_maxsz + \

				encode_commit_maxsz + \

				encode_getattr_maxsz)

				encode_commit_maxsz)

#define NFS4_dec_commit_sz	(compound_decode_hdr_maxsz + \

				decode_sequence_maxsz + \

				decode_putfh_maxsz + \

				decode_commit_maxsz + \

				decode_getattr_maxsz)

				decode_commit_maxsz)

#define NFS4_enc_open_sz        (compound_encode_hdr_maxsz + \

				encode_sequence_maxsz + \

				encode_putfh_maxsz + \
@@ -2425,8 +2423,6 @@ static void nfs4_xdr_enc_commit(struct rpc_rqst *req, struct xdr_stream *xdr, 
	encode_sequence(xdr, &args->seq_args, &hdr);

	encode_putfh(xdr, args->fh, &hdr);

	encode_commit(xdr, args, &hdr);

	if (args->bitmask)

		encode_getfattr(xdr, args->bitmask, &hdr);

	encode_nops(&hdr);

}
@@ -6306,10 +6302,6 @@ static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, struct xdr_stream *xdr, 
	if (status)

		goto out;

	status = decode_commit(xdr, res);

	if (status)

		goto out;

	if (res->fattr)

		decode_getfattr(xdr, res->fattr, res->server);

out:

	return status;

}