aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Tao <bergwolf@gmail.com>2011-07-30 20:52:34 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-04 21:58:37 -0700
commit40a3e9966c347b2e722785aecd9c0165457d61f3 (patch)
treec7bf582c17daa984dc831d0551cdf923fe96b17b
parent892cd4a38f0d379dfdbc1a0a45eaa31a89976796 (diff)
downloadkernel_samsung_aries-40a3e9966c347b2e722785aecd9c0165457d61f3.zip
kernel_samsung_aries-40a3e9966c347b2e722785aecd9c0165457d61f3.tar.gz
kernel_samsung_aries-40a3e9966c347b2e722785aecd9c0165457d61f3.tar.bz2
pnfs: use lwb as layoutcommit length
commit 3557c6c3be5b2ca0b11365db7f8a813253eb520b upstream. Using NFS4_MAX_UINT64 will break current protocol. [Needed in v3.0] Signed-off-by: Peng Tao <peng_tao@emc.com> Signed-off-by: Jim Rees <rees@umich.edu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--fs/nfs/nfs4xdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index e6e8f3b..fc97fd5 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1888,7 +1888,7 @@ encode_layoutcommit(struct xdr_stream *xdr,
*p++ = cpu_to_be32(OP_LAYOUTCOMMIT);
/* Only whole file layouts */
p = xdr_encode_hyper(p, 0); /* offset */
- p = xdr_encode_hyper(p, NFS4_MAX_UINT64); /* length */
+ p = xdr_encode_hyper(p, args->lastbytewritten + 1); /* length */
*p++ = cpu_to_be32(0); /* reclaim */
p = xdr_encode_opaque_fixed(p, args->stateid.data, NFS4_STATEID_SIZE);
*p++ = cpu_to_be32(1); /* newoffset = TRUE */