summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-09-01 03:31:33 -0700
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-09-01 15:12:11 -0700
commit388ef16640cefd202daa723fba02e7c0266f8454 (patch)
tree794d155fa7736762624f6e215831830e29258f82 /fs
parent972398fa0a5f47c6ee0bde4d6d24b29f90ec888d (diff)
downloadtalos-obmc-linux-388ef16640cefd202daa723fba02e7c0266f8454.tar.gz
talos-obmc-linux-388ef16640cefd202daa723fba02e7c0266f8454.zip
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: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/flexfilelayout/flexfilelayoutdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c
index b28fa4cbea52..883d35c86778 100644
--- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c
+++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c
@@ -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;
}
OpenPOWER on IntegriCloud