NFSv4.1: File layout only supports whole file layouts

Ask for whole file layouts. Until support for layout segments is fully
supported in the file layout code, discard non-whole file layouts.

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

1 files changed, 45 insertions, 2 deletions

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index d1ae5bfa6680..51c19093022e 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -427,6 +427,14 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo,
 
         dprintk("--> %s\n", __func__);
 
+        /* FIXME: remove this check when layout segment support is added */
+        if (lgr->range.offset != 0 ||
+            lgr->range.length != NFS4_MAX_UINT64) {
+                dprintk("%s Only whole file layouts supported. Use MDS i/o\n",
+                        __func__);
+                goto out;
+        }
+
         if (fl->pattern_offset > lgr->range.offset) {
                 dprintk("%s pattern_offset %lld too large\n",
                                 __func__, fl->pattern_offset);
@@ -679,14 +687,49 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,
         return (p_stripe == r_stripe);
 }
 
+void
+filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio,
+                        struct nfs_page *req)
+{
+        BUG_ON(pgio->pg_lseg != NULL);
+
+        pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
+                                           req->wb_context,
+                                           0,
+                                           NFS4_MAX_UINT64,
+                                           IOMODE_READ,
+                                           GFP_KERNEL);
+        /* If no lseg, fall back to read through mds */
+        if (pgio->pg_lseg == NULL)
+                nfs_pageio_init_read_mds(pgio, pgio->pg_inode);
+}
+
+void
+filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio,
+                         struct nfs_page *req)
+{
+        BUG_ON(pgio->pg_lseg != NULL);
+
+        pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
+                                           req->wb_context,
+                                           0,
+                                           NFS4_MAX_UINT64,
+                                           IOMODE_RW,
+                                           GFP_NOFS);
+        /* If no lseg, fall back to write through mds */
+        if (pgio->pg_lseg == NULL)
+                nfs_pageio_init_write_mds(pgio, pgio->pg_inode,
+                                          pgio->pg_ioflags);
+}
+
 static const struct nfs_pageio_ops filelayout_pg_read_ops = {
-        .pg_init = pnfs_generic_pg_init_read,
+        .pg_init = filelayout_pg_init_read,
         .pg_test = filelayout_pg_test,
         .pg_doio = nfs_generic_pg_readpages,
 };
 
 static const struct nfs_pageio_ops filelayout_pg_write_ops = {
-        .pg_init = pnfs_generic_pg_init_write,
+        .pg_init = filelayout_pg_init_write,
         .pg_test = filelayout_pg_test,
         .pg_doio = nfs_generic_pg_writepages,
 };