1 files changed, 16 insertions, 2 deletions

diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index 02ec07973bc4..bb1f4e7a3270 100644
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -202,6 +202,7 @@ static int filelayout_async_handle_error(struct rpc_task *task,
                         task->tk_status);
                 nfs4_mark_deviceid_unavailable(devid);
                 pnfs_error_mark_layout_for_return(inode, lseg);
+                pnfs_set_lo_fail(lseg);
                 rpc_wake_up(&tbl->slot_tbl_waitq);
                 /* fall through */
         default:
@@ -883,13 +884,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 +909,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;