diff options
author | Fred Isaman <iisaman@netapp.com> | 2012-04-20 14:47:39 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-27 14:10:37 -0400 |
commit | 0b7c01533aa9f4a228d07d2768d084acb3a387bc (patch) | |
tree | aa57b08ce42f1effea2294354e3c9770b70e7612 /fs/nfs/nfs4xdr.c | |
parent | 799ba8d53d32c84bd2a867ca2689538a48176140 (diff) |
NFS: add a struct nfs_commit_data to replace nfs_write_data in commits
Commits don't need the vectors of pages, etc. that writes do. Split out
a separate structure for the commit operation.
Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
-rw-r--r-- | fs/nfs/nfs4xdr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index c54aae364bee..4c3cc0ed9543 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -1103,7 +1103,7 @@ static void encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg | |||
1103 | encode_nfs4_stateid(xdr, arg->stateid); | 1103 | encode_nfs4_stateid(xdr, arg->stateid); |
1104 | } | 1104 | } |
1105 | 1105 | ||
1106 | static void encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *args, struct compound_hdr *hdr) | 1106 | static void encode_commit(struct xdr_stream *xdr, const struct nfs_commitargs *args, struct compound_hdr *hdr) |
1107 | { | 1107 | { |
1108 | __be32 *p; | 1108 | __be32 *p; |
1109 | 1109 | ||
@@ -2448,7 +2448,7 @@ static void nfs4_xdr_enc_write(struct rpc_rqst *req, struct xdr_stream *xdr, | |||
2448 | * a COMMIT request | 2448 | * a COMMIT request |
2449 | */ | 2449 | */ |
2450 | static void nfs4_xdr_enc_commit(struct rpc_rqst *req, struct xdr_stream *xdr, | 2450 | static void nfs4_xdr_enc_commit(struct rpc_rqst *req, struct xdr_stream *xdr, |
2451 | struct nfs_writeargs *args) | 2451 | struct nfs_commitargs *args) |
2452 | { | 2452 | { |
2453 | struct compound_hdr hdr = { | 2453 | struct compound_hdr hdr = { |
2454 | .minorversion = nfs4_xdr_minorversion(&args->seq_args), | 2454 | .minorversion = nfs4_xdr_minorversion(&args->seq_args), |
@@ -4102,7 +4102,7 @@ static int decode_verifier(struct xdr_stream *xdr, void *verifier) | |||
4102 | return decode_opaque_fixed(xdr, verifier, NFS4_VERIFIER_SIZE); | 4102 | return decode_opaque_fixed(xdr, verifier, NFS4_VERIFIER_SIZE); |
4103 | } | 4103 | } |
4104 | 4104 | ||
4105 | static int decode_commit(struct xdr_stream *xdr, struct nfs_writeres *res) | 4105 | static int decode_commit(struct xdr_stream *xdr, struct nfs_commitres *res) |
4106 | { | 4106 | { |
4107 | int status; | 4107 | int status; |
4108 | 4108 | ||
@@ -6353,7 +6353,7 @@ out: | |||
6353 | * Decode COMMIT response | 6353 | * Decode COMMIT response |
6354 | */ | 6354 | */ |
6355 | static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, struct xdr_stream *xdr, | 6355 | static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, struct xdr_stream *xdr, |
6356 | struct nfs_writeres *res) | 6356 | struct nfs_commitres *res) |
6357 | { | 6357 | { |
6358 | struct compound_hdr hdr; | 6358 | struct compound_hdr hdr; |
6359 | int status; | 6359 | int status; |