diff options
| author | Alan Somers <asomers@FreeBSD.org> | 2024-04-25 21:24:52 +0000 |
|---|---|---|
| committer | Tony Hutter <hutter2@llnl.gov> | 2024-04-30 17:01:15 +0000 |
| commit | 3d4d61988ad20e88d704647f3c86f42176b460e0 (patch) | |
| tree | 4eef6888d9594d3fd035b80b6e8d106f968446f4 | |
| parent | 61f3638a3463b58168b9c2b0d1f8605fde1349d9 (diff) | |
| download | src-3d4d61988ad20e88d704647f3c86f42176b460e0.tar.gz src-3d4d61988ad20e88d704647f3c86f42176b460e0.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 b6edac434dea..7c418f26fc14 100644 --- a/module/os/freebsd/zfs/zvol_os.c +++ b/module/os/freebsd/zfs/zvol_os.c @@ -1273,7 +1273,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 c7360293f0e6..61c8db5d8178 100644 --- a/module/os/linux/zfs/zvol_os.c +++ b/module/os/linux/zfs/zvol_os.c @@ -1564,7 +1564,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)); |