summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorFred Isaman <iisaman@netapp.com>2012-07-18 14:20:49 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-07-30 18:08:53 -0400
commit59948db3be76099b14c7103d0f46c5454b173c3a (patch)
treee5829a90b1872f012cce4d93ee44cdd22218d462 /fs
parentcac5d07e3ca696dcacfb123553cf6c722111cfd3 (diff)
downloadblackbird-op-linux-59948db3be76099b14c7103d0f46c5454b173c3a.tar.gz
blackbird-op-linux-59948db3be76099b14c7103d0f46c5454b173c3a.zip
NFS: fix pnfs regression with directio reads
Commit 1abb50886af "NFS: Create an read_pageio_init() function" did not modify the call in direct.c, preventing direct io from using pnfs. This reintroduces that capability. Signed-off-by: Fred Isaman <iisaman@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/direct.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 48253372ab1d..69f20c73220e 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -393,7 +393,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq,
size_t requested_bytes = 0;
unsigned long seg;
- nfs_pageio_init_read(&desc, dreq->inode,
+ NFS_PROTO(dreq->inode)->read_pageio_init(&desc, dreq->inode,
&nfs_direct_read_completion_ops);
get_dreq(dreq);
desc.pg_dreq = dreq;
OpenPOWER on IntegriCloud