pNFS/filelayout: treat GETDEVICEINFO errors as layout failure

Olga Kornievskaia · amschuma-ntap · commit 28d4411fc3b5 · 2023-02-15T11:07:54.000-05:00
When GETDEVICEINFO call fails, return the layout and fall back to MDS.

Signed-off-by: Olga Kornievskaia &lt;kolga@netapp.com&gt;
Signed-off-by: Anna Schumaker &lt;Anna.Schumaker@Netapp.com&gt;
diff --git 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
@@ -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__,

Original file line number	Diff line number	Diff line change
`@@ -862,6 +862,8 @@ fl_pnfs_update_layout(struct inode *ino,`
`862`	`862`
`863`	`863`	`status = filelayout_check_deviceid(lo, fl, gfp_flags);`
`864`	`864`	`if (status) {`
	`865`	`+ pnfs_error_mark_layout_for_return(ino, lseg);`
	`866`	`+ pnfs_set_lo_fail(lseg);`
`865`	`867`	`pnfs_put_lseg(lseg);`
`866`	`868`	`lseg = NULL;`
`867`	`869`	`}`