Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 388ef166 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1/flexfiles: Fix incorrect usage of pnfs_generic_mark_devid_invalid() 



Unlike the files layout, flexfiles does not test for the NFS_DEVICEID_INVALID
flag. Instead it relies on NFS_DEVICEID_UNAVAILABLE.
Fix is to replace with nfs4_mark_deviceid_unavailable().

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 972398fa

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+2 −2
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ nfs4_ff_layout_select_ds_fh(struct pnfs_layout_segment *lseg, u32 mirror_idx) 
			__func__, mirror_idx);

		if (mirror && mirror->mirror_ds) {

			devid = &mirror->mirror_ds->id_node;

			pnfs_generic_mark_devid_invalid(devid);

			nfs4_mark_deviceid_unavailable(devid);

		}

		goto out;

	}
@@ -374,7 +374,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, 
			__func__, ds_idx);

		if (mirror && mirror->mirror_ds) {

			devid = &mirror->mirror_ds->id_node;

			pnfs_generic_mark_devid_invalid(devid);

			nfs4_mark_deviceid_unavailable(devid);

		}

		goto out;

	}