pNFS/filelayout: treat GETDEVICEINFO errors as layout failure

When GETDEVICEINFO call fails, return the layout and fall back to MDS.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index 4974cd18ca468ed8f7301556907c0075e0738fa2..ce8f8934bca517c0ea9a3ab21d0a3721fa075fac 100644 (file)
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -862,6 +862,8 @@ fl_pnfs_update_layout(struct inode *ino,
 
        status = filelayout_check_deviceid(lo, fl, gfp_flags);
        if (status) {
+               pnfs_error_mark_layout_for_return(ino, lseg);
+               pnfs_set_lo_fail(lseg);
                pnfs_put_lseg(lseg);
                lseg = NULL;
        }

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index a5db5158c63455e1d0424c046ee77cb082a7d731..306cba0b9e69af45b7fd5e57926dccb9c886ec77 100644 (file)
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -511,7 +511,7 @@ pnfs_layout_io_set_failed(struct pnfs_layout_hdr *lo, u32 iomode)
 
        spin_lock(&inode->i_lock);
        pnfs_layout_set_fail_bit(lo, pnfs_iomode_to_fail_bit(iomode));
-       pnfs_mark_matching_lsegs_invalid(lo, &head, &range, 0);
+       pnfs_mark_matching_lsegs_return(lo, &head, &range, 0);
        spin_unlock(&inode->i_lock);
        pnfs_free_lseg_list(&head);
        dprintk("%s Setting layout IOMODE_%s fail bit\n", __func__,