]> git.karo-electronics.de Git - linux-beck.git/commitdiff
NFS: fix pnfs regression with directio reads
authorFred Isaman <iisaman@netapp.com>
Wed, 18 Jul 2012 18:20:49 +0000 (14:20 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 30 Jul 2012 22:08:53 +0000 (18:08 -0400)
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>
fs/nfs/direct.c

index 48253372ab1d115def0b81f56b097db6e98a0f88..69f20c73220e345def6b365a96e357c93ca657ef 100644 (file)
@@ -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;