aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/pnfs.h
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.h
parent18ad0a9f2ccd260d37dd6bc5fa04c7819def4c84 (diff)
downloadkernel_samsung_smdk4412-89a58e32d9105c01022a757fb32ddc3b51bf0025.tar.gz
kernel_samsung_smdk4412-89a58e32d9105c01022a757fb32ddc3b51bf0025.tar.bz2
kernel_samsung_smdk4412-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.h')
-rw-r--r--fs/nfs/pnfs.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 65daae59c8a..48d0a8e4d06 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -295,8 +295,10 @@ static inline int pnfs_return_layout(struct inode *ino)
static inline void pnfs_pageio_init(struct nfs_pageio_descriptor *pgio,
struct inode *inode)
{
- if (NFS_SERVER(inode)->pnfs_curr_ld)
- pgio->pg_test = pnfs_generic_pg_test;
+ struct pnfs_layoutdriver_type *ld = NFS_SERVER(inode)->pnfs_curr_ld;
+
+ if (ld)
+ pgio->pg_test = ld->pg_test;
}
#else /* CONFIG_NFS_V4_1 */