summaryrefslogtreecommitdiffstats
path: root/fs/nfs/pnfs.c
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2011-05-25 20:54:40 +0300
committerBoaz Harrosh <bharrosh@panasas.com>2011-05-29 20:56:55 +0300
commit89a58e32d9105c01022a757fb32ddc3b51bf0025 (patch)
treefd04ff022a084339868e81fc9a4679667c2b70bd /fs/nfs/pnfs.c
parent18ad0a9f2ccd260d37dd6bc5fa04c7819def4c84 (diff)
downloadblackbird-op-linux-89a58e32d9105c01022a757fb32ddc3b51bf0025.tar.gz
blackbird-op-linux-89a58e32d9105c01022a757fb32ddc3b51bf0025.zip
NFSv4.1: use pnfs_generic_pg_test directly by layout driver
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Diffstat (limited to 'fs/nfs/pnfs.c')
-rw-r--r--fs/nfs/pnfs.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 212fc292761a..d79f2df33a46 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1067,12 +1067,17 @@ pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,
pgio->pg_count,
access_type,
gfp_flags);
- } else if (pgio->pg_lseg &&
- req_offset(req) > end_offset(pgio->pg_lseg->pls_range.offset,
- pgio->pg_lseg->pls_range.length))
+ return true;
+ }
+
+ if (pgio->pg_lseg &&
+ req_offset(req) > end_offset(pgio->pg_lseg->pls_range.offset,
+ pgio->pg_lseg->pls_range.length))
return false;
- return NFS_SERVER(pgio->pg_inode)->pnfs_curr_ld->pg_test(pgio, prev, req);
+
+ return true;
}
+EXPORT_SYMBOL_GPL(pnfs_generic_pg_test);
/*
* Called by non rpc-based layout drivers
OpenPOWER on IntegriCloud