2 files changed, 1 insertions, 3 deletions

diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index ae07b0f56659..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:
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 6b42362cdbb0..113c3b327e24 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1763,7 +1763,6 @@ void pnfs_error_mark_layout_for_return(struct inode *inode,
                                        struct pnfs_layout_segment *lseg)
 {
         struct pnfs_layout_hdr *lo = NFS_I(inode)->layout;
-        int iomode = pnfs_iomode_to_fail_bit(lseg->pls_range.iomode);
         struct pnfs_layout_range range = {
                 .iomode = lseg->pls_range.iomode,
                 .offset = 0,
@@ -1772,8 +1771,6 @@ void pnfs_error_mark_layout_for_return(struct inode *inode,
         LIST_HEAD(free_me);
 
         spin_lock(&inode->i_lock);
-        /* set failure bit so that pnfs path will be retried later */
-        pnfs_layout_set_fail_bit(lo, iomode);
         if (lo->plh_return_iomode == 0)
                 lo->plh_return_iomode = range.iomode;
         else if (lo->plh_return_iomode != range.iomode)