diff options
author | Fred Isaman <iisaman@netapp.com> | 2012-04-20 14:47:51 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-27 14:10:38 -0400 |
commit | 584aa810b6240d88c28113a90c5029449814a3b5 (patch) | |
tree | 694b0942747c9ee7b8f53f21cb81ddc32cc07bbb /fs/nfs/read.c | |
parent | 1825a0d08f22463e5a8f4b1636473efd057a3479 (diff) |
NFS: rewrite directio read to use async coalesce code
This also has the advantage that it allows directio to use pnfs.
Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/read.c')
-rw-r--r-- | fs/nfs/read.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 5e78af162039..35e2dcebffe6 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c | |||
@@ -51,8 +51,8 @@ struct nfs_read_header *nfs_readhdr_alloc() | |||
51 | return rhdr; | 51 | return rhdr; |
52 | } | 52 | } |
53 | 53 | ||
54 | struct nfs_read_data *nfs_readdata_alloc(struct nfs_pgio_header *hdr, | 54 | static struct nfs_read_data *nfs_readdata_alloc(struct nfs_pgio_header *hdr, |
55 | unsigned int pagecount) | 55 | unsigned int pagecount) |
56 | { | 56 | { |
57 | struct nfs_read_data *data, *prealloc; | 57 | struct nfs_read_data *data, *prealloc; |
58 | 58 | ||
@@ -123,9 +123,9 @@ void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio) | |||
123 | } | 123 | } |
124 | EXPORT_SYMBOL_GPL(nfs_pageio_reset_read_mds); | 124 | EXPORT_SYMBOL_GPL(nfs_pageio_reset_read_mds); |
125 | 125 | ||
126 | static void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, | 126 | void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, |
127 | struct inode *inode, | 127 | struct inode *inode, |
128 | const struct nfs_pgio_completion_ops *compl_ops) | 128 | const struct nfs_pgio_completion_ops *compl_ops) |
129 | { | 129 | { |
130 | if (!pnfs_pageio_init_read(pgio, inode, compl_ops)) | 130 | if (!pnfs_pageio_init_read(pgio, inode, compl_ops)) |
131 | nfs_pageio_init_read_mds(pgio, inode, compl_ops); | 131 | nfs_pageio_init_read_mds(pgio, inode, compl_ops); |