c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update vdev devid and physpath if changed between imports

Browse Source 
If devid or physpath for a vdev changes between imports, ensure it is
updated to the new value.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>
Closes #15816
This commit is contained in:
Ameer Hamza 2024-01-27 03:24:35 +05:00 committed by Brian Behlendorf
parent 9ad150446f
commit dd3a0a2715
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
module/zfs/vdev.c
View File

@ -2484,23 +2484,37 @@ vdev_validate(vdev_t *vd)
return (0); return (0);
} }
static void
vdev_update_path(const char *prefix, char *svd, char **dvd, uint64_t guid)
{
if (svd != NULL && *dvd != NULL) {
if (strcmp(svd, *dvd) != 0) {
zfs_dbgmsg("vdev_copy_path: vdev %llu: %s changed "
"from '%s' to '%s'", (u_longlong_t)guid, prefix,
*dvd, svd);
spa_strfree(*dvd);
*dvd = spa_strdup(svd);
}
} else if (svd != NULL) {
*dvd = spa_strdup(svd);
zfs_dbgmsg("vdev_copy_path: vdev %llu: path set to '%s'",
(u_longlong_t)guid, *dvd);
}
}
static void static void
vdev_copy_path_impl(vdev_t *svd, vdev_t *dvd) vdev_copy_path_impl(vdev_t *svd, vdev_t *dvd)
{ {
char *old, *new; char *old, *new;
if (svd->vdev_path != NULL && dvd->vdev_path != NULL) {
if (strcmp(svd->vdev_path, dvd->vdev_path) != 0) { vdev_update_path("vdev_path", svd->vdev_path, &dvd->vdev_path,
zfs_dbgmsg("vdev_copy_path: vdev %llu: path changed " dvd->vdev_guid);
"from '%s' to '%s'", (u_longlong_t)dvd->vdev_guid,
dvd->vdev_path, svd->vdev_path); vdev_update_path("vdev_devid", svd->vdev_devid, &dvd->vdev_devid,
spa_strfree(dvd->vdev_path); dvd->vdev_guid);
dvd->vdev_path = spa_strdup(svd->vdev_path);
} vdev_update_path("vdev_physpath", svd->vdev_physpath,
} else if (svd->vdev_path != NULL) { &dvd->vdev_physpath, dvd->vdev_guid);
dvd->vdev_path = spa_strdup(svd->vdev_path);
zfs_dbgmsg("vdev_copy_path: vdev %llu: path set to '%s'",
(u_longlong_t)dvd->vdev_guid, dvd->vdev_path);
}
/* /*
* Our enclosure sysfs path may have changed between imports * Our enclosure sysfs path may have changed between imports