diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-28 02:43:20 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-28 02:43:20 +0200 |
| commit | 6669cb8bed02ec1b60e80f2e1e317afc28544207 (patch) | |
| tree | 6e75bd1dc2f12b4df22b6545b2661fa09824a42b /fs/nfs/nfs4xdr.c | |
| parent | NFSv4.1/flexfiles: Fix a protocol error in layoutreturn (diff) | |
| download | linux-6669cb8bed02ec1b60e80f2e1e317afc28544207.tar.xz linux-6669cb8bed02ec1b60e80f2e1e317afc28544207.zip | |
NFSv4.1/pnfs: Ensure layoutreturn reserves space for the opaque payload
The "FIXME" is outdated. Flexfiles does add a payload.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
| -rw-r--r-- | fs/nfs/nfs4xdr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index a7be571c1666..ff4784c54e04 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -400,7 +400,8 @@ static int nfs4_stat_to_errno(int); #define decode_layoutcommit_maxsz (op_decode_hdr_maxsz + 3) #define encode_layoutreturn_maxsz (8 + op_encode_hdr_maxsz + \ encode_stateid_maxsz + \ - 1 /* FIXME: opaque lrf_body always empty at the moment */) + 1 + \ + XDR_QUADLEN(NFS4_OPAQUE_LIMIT)) #define decode_layoutreturn_maxsz (op_decode_hdr_maxsz + \ 1 + decode_stateid_maxsz) #define encode_secinfo_no_name_maxsz (op_encode_hdr_maxsz + 1) |