diff options
author | Benny Halevy <bhalevy@panasas.com> | 2011-05-25 13:25:22 -0400 |
---|---|---|
committer | Boaz Harrosh <bharrosh@panasas.com> | 2011-05-29 13:56:43 -0400 |
commit | dfed206b8857d41a91ebba030f99e30017a44dda (patch) | |
tree | ac4c161b548e872e92da36499a2e8c28f5a34aeb /fs/nfs/read.c | |
parent | a0fe8bf427f4987d7b82678292ca03cfd7331467 (diff) |
NFSv4.1: unify pnfs_pageio_init functions
Use common code for pnfs_pageio_init_{read,write} and use
a common generic pg_test function.
Note that this function always assumes the the layout driver's
pg_test method is implemented.
[Fix BUG]
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Diffstat (limited to 'fs/nfs/read.c')
-rw-r--r-- | fs/nfs/read.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 540c8bc93f95..20a7f952e244 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c | |||
@@ -664,7 +664,6 @@ int nfs_readpages(struct file *filp, struct address_space *mapping, | |||
664 | if (ret == 0) | 664 | if (ret == 0) |
665 | goto read_complete; /* all pages were read */ | 665 | goto read_complete; /* all pages were read */ |
666 | 666 | ||
667 | pnfs_pageio_init_read(&pgio, inode); | ||
668 | if (rsize < PAGE_CACHE_SIZE) | 667 | if (rsize < PAGE_CACHE_SIZE) |
669 | nfs_pageio_init(&pgio, inode, nfs_pagein_multi, rsize, 0); | 668 | nfs_pageio_init(&pgio, inode, nfs_pagein_multi, rsize, 0); |
670 | else | 669 | else |