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>

2 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 0a5b63f16116..f9ee9eba7f88 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -68,6 +68,7 @@ struct nfs_pageio_descriptor {
         const struct rpc_call_ops *pg_rpc_callops;
         const struct nfs_pgio_completion_ops *pg_completion_ops;
         struct pnfs_layout_segment *pg_lseg;
+        struct nfs_direct_req   *pg_dreq;
 };
 
 #define NFS_WBACK_BUSY(req)     (test_bit(PG_BUSY,&(req)->wb_flags))
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 6fa1d2278c9d..38687b87ca9b 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1208,6 +1208,7 @@ struct nfs_pgio_header {
         const struct rpc_call_ops *mds_ops;
         void (*release) (struct nfs_pgio_header *hdr);
         const struct nfs_pgio_completion_ops *completion_ops;
+        struct nfs_direct_req   *dreq;
         spinlock_t              lock;
         /* fields protected by lock */
         int                     pnfs_error;
@@ -1221,8 +1222,6 @@ struct nfs_read_header {
         struct nfs_read_data    rpc_data;
 };
 
-struct nfs_direct_req;
-
 struct nfs_write_data {
         struct nfs_pgio_header  *header;
         struct list_head        list;
@@ -1264,6 +1263,7 @@ struct nfs_commit_data {
 
 struct nfs_pgio_completion_ops {
         void    (*error_cleanup)(struct list_head *head);
+        void    (*init_hdr)(struct nfs_pgio_header *hdr);
         void    (*completion)(struct nfs_pgio_header *hdr);
 };