mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
NFS/flexfiles: Remove dead code in ff_layout_mirror_valid()
nfs4_ff_alloc_deviceid_node() guarantees that if mirror->mirror_ds is a valid pointer, then so is mirror->mirror_ds->ds. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
parent
4cbc8a571c
commit
29a23909e4
1 changed files with 0 additions and 15 deletions
|
@ -183,15 +183,6 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ff_layout_mark_devid_invalid(struct pnfs_layout_segment *lseg,
|
|
||||||
struct nfs4_deviceid_node *devid)
|
|
||||||
{
|
|
||||||
nfs4_mark_deviceid_unavailable(devid);
|
|
||||||
if (!ff_layout_has_available_ds(lseg))
|
|
||||||
pnfs_error_mark_layout_for_return(lseg->pls_layout->plh_inode,
|
|
||||||
lseg);
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool ff_layout_mirror_valid(struct pnfs_layout_segment *lseg,
|
static bool ff_layout_mirror_valid(struct pnfs_layout_segment *lseg,
|
||||||
struct nfs4_ff_layout_mirror *mirror,
|
struct nfs4_ff_layout_mirror *mirror,
|
||||||
bool create)
|
bool create)
|
||||||
|
@ -221,12 +212,6 @@ static bool ff_layout_mirror_valid(struct pnfs_layout_segment *lseg,
|
||||||
if (IS_ERR(mirror->mirror_ds))
|
if (IS_ERR(mirror->mirror_ds))
|
||||||
goto outerr;
|
goto outerr;
|
||||||
|
|
||||||
if (mirror->mirror_ds->ds == NULL) {
|
|
||||||
struct nfs4_deviceid_node *devid;
|
|
||||||
devid = &mirror->mirror_ds->id_node;
|
|
||||||
ff_layout_mark_devid_invalid(lseg, devid);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
outerr:
|
outerr:
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in a new issue