NFS: prepare coalesce testing for directio

The coalesce code made assumptions that will no longer be true once
non-page aligned io occurs.  This introduces no change in
current behavior, but allows for more general situations to come.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 02d8170ce0f3..e40523f2fe26 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -796,6 +796,16 @@ filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio,
 {
         BUG_ON(pgio->pg_lseg != NULL);
 
+        if (req->wb_offset != req->wb_pgbase) {
+                /*
+                 * Handling unaligned pages is difficult, because have to
+                 * somehow split a req in two in certain cases in the
+                 * pg.test code.  Avoid this by just not using pnfs
+                 * in this case.
+                 */
+                nfs_pageio_reset_read_mds(pgio);
+                return;
+        }
         pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
                                            req->wb_context,
                                            0,
@@ -815,6 +825,8 @@ filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio,
 
         BUG_ON(pgio->pg_lseg != NULL);
 
+        if (req->wb_offset != req->wb_pgbase)
+                goto out_mds;
         pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
                                            req->wb_context,
                                            0,