aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/pnfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/pnfs.c')
-rw-r--r--fs/nfs/pnfs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 2fa483e6dbe2..89a5ef4df08a 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -841,7 +841,7 @@ send_layoutget(struct pnfs_layout_hdr *lo,
841 841
842 i_size = i_size_read(ino); 842 i_size = i_size_read(ino);
843 843
844 lgp->args.minlength = PAGE_CACHE_SIZE; 844 lgp->args.minlength = PAGE_SIZE;
845 if (lgp->args.minlength > range->length) 845 if (lgp->args.minlength > range->length)
846 lgp->args.minlength = range->length; 846 lgp->args.minlength = range->length;
847 if (range->iomode == IOMODE_READ) { 847 if (range->iomode == IOMODE_READ) {
@@ -1618,13 +1618,13 @@ lookup_again:
1618 spin_unlock(&clp->cl_lock); 1618 spin_unlock(&clp->cl_lock);
1619 } 1619 }
1620 1620
1621 pg_offset = arg.offset & ~PAGE_CACHE_MASK; 1621 pg_offset = arg.offset & ~PAGE_MASK;
1622 if (pg_offset) { 1622 if (pg_offset) {
1623 arg.offset -= pg_offset; 1623 arg.offset -= pg_offset;
1624 arg.length += pg_offset; 1624 arg.length += pg_offset;
1625 } 1625 }
1626 if (arg.length != NFS4_MAX_UINT64) 1626 if (arg.length != NFS4_MAX_UINT64)
1627 arg.length = PAGE_CACHE_ALIGN(arg.length); 1627 arg.length = PAGE_ALIGN(arg.length);
1628 1628
1629 lseg = send_layoutget(lo, ctx, &arg, gfp_flags); 1629 lseg = send_layoutget(lo, ctx, &arg, gfp_flags);
1630 atomic_dec(&lo->plh_outstanding); 1630 atomic_dec(&lo->plh_outstanding);