diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-29 10:44:42 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-01 15:42:45 -0400 |
commit | 8582715e733d08bc98fe629db0601360d70de4dc (patch) | |
tree | dbdbe5b56dce73beffadc5178a0fe80165146028 /fs/nfs/nfs4xdr.c | |
parent | 5a37f85131c526ed7a3991d4dc2845498f81c1de (diff) |
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: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
-rw-r--r-- | fs/nfs/nfs4xdr.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 49483f19c5d3..db040e971932 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -421,13 +421,11 @@ static int nfs4_stat_to_errno(int); | |||
421 | #define NFS4_enc_commit_sz (compound_encode_hdr_maxsz + \ | 421 | #define NFS4_enc_commit_sz (compound_encode_hdr_maxsz + \ |
422 | encode_sequence_maxsz + \ | 422 | encode_sequence_maxsz + \ |
423 | encode_putfh_maxsz + \ | 423 | encode_putfh_maxsz + \ |
424 | encode_commit_maxsz + \ | 424 | encode_commit_maxsz) |
425 | encode_getattr_maxsz) | ||
426 | #define NFS4_dec_commit_sz (compound_decode_hdr_maxsz + \ | 425 | #define NFS4_dec_commit_sz (compound_decode_hdr_maxsz + \ |
427 | decode_sequence_maxsz + \ | 426 | decode_sequence_maxsz + \ |
428 | decode_putfh_maxsz + \ | 427 | decode_putfh_maxsz + \ |
429 | decode_commit_maxsz + \ | 428 | decode_commit_maxsz) |
430 | decode_getattr_maxsz) | ||
431 | #define NFS4_enc_open_sz (compound_encode_hdr_maxsz + \ | 429 | #define NFS4_enc_open_sz (compound_encode_hdr_maxsz + \ |
432 | encode_sequence_maxsz + \ | 430 | encode_sequence_maxsz + \ |
433 | encode_putfh_maxsz + \ | 431 | encode_putfh_maxsz + \ |
@@ -2425,8 +2423,6 @@ static void nfs4_xdr_enc_commit(struct rpc_rqst *req, struct xdr_stream *xdr, | |||
2425 | encode_sequence(xdr, &args->seq_args, &hdr); | 2423 | encode_sequence(xdr, &args->seq_args, &hdr); |
2426 | encode_putfh(xdr, args->fh, &hdr); | 2424 | encode_putfh(xdr, args->fh, &hdr); |
2427 | encode_commit(xdr, args, &hdr); | 2425 | encode_commit(xdr, args, &hdr); |
2428 | if (args->bitmask) | ||
2429 | encode_getfattr(xdr, args->bitmask, &hdr); | ||
2430 | encode_nops(&hdr); | 2426 | encode_nops(&hdr); |
2431 | } | 2427 | } |
2432 | 2428 | ||
@@ -6306,10 +6302,6 @@ static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, struct xdr_stream *xdr, | |||
6306 | if (status) | 6302 | if (status) |
6307 | goto out; | 6303 | goto out; |
6308 | status = decode_commit(xdr, res); | 6304 | status = decode_commit(xdr, res); |
6309 | if (status) | ||
6310 | goto out; | ||
6311 | if (res->fattr) | ||
6312 | decode_getfattr(xdr, res->fattr, res->server); | ||
6313 | out: | 6305 | out: |
6314 | return status; | 6306 | return status; |
6315 | } | 6307 | } |