diff options
author | Fred Isaman <iisaman@netapp.com> | 2012-07-18 14:20:50 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-30 18:09:06 -0400 |
commit | c95908e4c50d218f016e3866f5abf786055df635 (patch) | |
tree | 1a1da389186cd47dac12876a43559a6d6eaaad9b /fs | |
parent | 59948db3be76099b14c7103d0f46c5454b173c3a (diff) |
NFS: fix pnfs regression with directio writes
Commit 57208fa7e51 "NFS: Create an write_pageio_init() function"
did not modify the calls 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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 69f20c73220e..42dce909ec70 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -478,7 +478,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) | |||
478 | dreq->count = 0; | 478 | dreq->count = 0; |
479 | get_dreq(dreq); | 479 | get_dreq(dreq); |
480 | 480 | ||
481 | nfs_pageio_init_write(&desc, dreq->inode, FLUSH_STABLE, | 481 | NFS_PROTO(dreq->inode)->write_pageio_init(&desc, dreq->inode, FLUSH_STABLE, |
482 | &nfs_direct_write_completion_ops); | 482 | &nfs_direct_write_completion_ops); |
483 | desc.pg_dreq = dreq; | 483 | desc.pg_dreq = dreq; |
484 | 484 | ||
@@ -782,7 +782,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, | |||
782 | size_t requested_bytes = 0; | 782 | size_t requested_bytes = 0; |
783 | unsigned long seg; | 783 | unsigned long seg; |
784 | 784 | ||
785 | nfs_pageio_init_write(&desc, inode, FLUSH_COND_STABLE, | 785 | NFS_PROTO(inode)->write_pageio_init(&desc, inode, FLUSH_COND_STABLE, |
786 | &nfs_direct_write_completion_ops); | 786 | &nfs_direct_write_completion_ops); |
787 | desc.pg_dreq = dreq; | 787 | desc.pg_dreq = dreq; |
788 | get_dreq(dreq); | 788 | get_dreq(dreq); |