NFS41: pop some layoutget errors to application

For ERESTARTSYS/EIO/EROFS/ENOSPC/E2BIG in layoutget, we
should just bail out instead of hiding the error and
retrying inband IO.

Change all the call sites to pop the error all the way up.

Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

1 files changed, 15 insertions, 2 deletions

diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index 02ec07973bc4..ae07b0f56659 100644
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -883,13 +883,19 @@ static void
 filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio,
                         struct nfs_page *req)
 {
-        if (!pgio->pg_lseg)
+        if (!pgio->pg_lseg) {
                 pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
                                            req->wb_context,
                                            0,
                                            NFS4_MAX_UINT64,
                                            IOMODE_READ,
                                            GFP_KERNEL);
+                if (IS_ERR(pgio->pg_lseg)) {
+                        pgio->pg_error = PTR_ERR(pgio->pg_lseg);
+                        pgio->pg_lseg = NULL;
+                        return;
+                }
+        }
         /* If no lseg, fall back to read through mds */
         if (pgio->pg_lseg == NULL)
                 nfs_pageio_reset_read_mds(pgio);
@@ -902,13 +908,20 @@ filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio,
         struct nfs_commit_info cinfo;
         int status;
 
-        if (!pgio->pg_lseg)
+        if (!pgio->pg_lseg) {
                 pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
                                            req->wb_context,
                                            0,
                                            NFS4_MAX_UINT64,
                                            IOMODE_RW,
                                            GFP_NOFS);
+                if (IS_ERR(pgio->pg_lseg)) {
+                        pgio->pg_error = PTR_ERR(pgio->pg_lseg);
+                        pgio->pg_lseg = NULL;
+                        return;
+                }
+        }
+
         /* If no lseg, fall back to write through mds */
         if (pgio->pg_lseg == NULL)
                 goto out_mds;