diff options
| author | Alan Somers <asomers@FreeBSD.org> | 2024-04-25 21:24:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-25 21:24:52 +0000 |
| commit | 21bc066ece7fcf0f8250ba5dfe05fd7f507dca28 (patch) | |
| tree | caf6e3a83a155ac1e778eb9f4b43378b88ff566d | |
| parent | 317b31eedb2b729985a48d5b98a3a5d34895eeb2 (diff) | |
| download | src-21bc066ece7fcf0f8250ba5dfe05fd7f507dca28.tar.gz src-21bc066ece7fcf0f8250ba5dfe05fd7f507dca28.zip | |
Fix updating the zvol_htable when renaming a zvol
When renaming a zvol, insert it into zvol_htable using the new name, not
the old name. Otherwise some operations won't work. For example,
"zfs set volsize" while the zvol is open.
Sponsored by: Axcient
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alek Pinchuk <apinchuk@axcient.com>
Signed-off-by: Alan Somers <asomers@FreeBSD.org>
Closes #16127
Closes #16128
| -rw-r--r-- | module/os/freebsd/zfs/zvol_os.c | 2 | ||||
| -rw-r--r-- | module/os/linux/zfs/zvol_os.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/module/os/freebsd/zfs/zvol_os.c b/module/os/freebsd/zfs/zvol_os.c index 6a7c2d2811b1..712ff1b837d7 100644 --- a/module/os/freebsd/zfs/zvol_os.c +++ b/module/os/freebsd/zfs/zvol_os.c @@ -1259,7 +1259,7 @@ zvol_os_rename_minor(zvol_state_t *zv, const char *newname) ASSERT(MUTEX_HELD(&zv->zv_state_lock)); /* Move to a new hashtable entry. */ - zv->zv_hash = zvol_name_hash(zv->zv_name); + zv->zv_hash = zvol_name_hash(newname); hlist_del(&zv->zv_hlink); hlist_add_head(&zv->zv_hlink, ZVOL_HT_HEAD(zv->zv_hash)); diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c index 4b960daf89ee..2a036dc5136b 100644 --- a/module/os/linux/zfs/zvol_os.c +++ b/module/os/linux/zfs/zvol_os.c @@ -1571,7 +1571,7 @@ zvol_os_rename_minor(zvol_state_t *zv, const char *newname) strlcpy(zv->zv_name, newname, sizeof (zv->zv_name)); /* move to new hashtable entry */ - zv->zv_hash = zvol_name_hash(zv->zv_name); + zv->zv_hash = zvol_name_hash(newname); hlist_del(&zv->zv_hlink); hlist_add_head(&zv->zv_hlink, ZVOL_HT_HEAD(zv->zv_hash)); |