c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-03-10 20:36:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix redundant declaration of dsl_pool_t

Browse Source 
Remove redundant dsl_pool variable and duplicate spa_get_dsl()
call in vdev_rebuild_thread.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Akash B <akash-b@hpe.com>
Closes #18263
This commit is contained in:
Akash B 2026-02-28 00:09:52 +05:30 committed by GitHub
parent f8457fbdc4
commit f8e5af53e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
module/zfs/vdev_rebuild.c
View File

@ -23,7 +23,7 @@
* *
* Copyright (c) 2018, Intel Corporation. * Copyright (c) 2018, Intel Corporation.
* Copyright (c) 2020 by Lawrence Livermore National Security, LLC. * Copyright (c) 2020 by Lawrence Livermore National Security, LLC.
* Copyright (c) 2022 Hewlett Packard Enterprise Development LP. * Copyright (c) 2022, 2026 Hewlett Packard Enterprise Development LP.
* Copyright (c) 2024 by Delphix. All rights reserved. * Copyright (c) 2024 by Delphix. All rights reserved.
*/ */
@ -762,6 +762,7 @@ vdev_rebuild_thread(void *arg)
vdev_t *vd = arg; vdev_t *vd = arg;
spa_t *spa = vd->vdev_spa; spa_t *spa = vd->vdev_spa;
vdev_t *rvd = spa->spa_root_vdev; vdev_t *rvd = spa->spa_root_vdev;
dsl_pool_t *dp = spa_get_dsl(spa);
int error = 0; int error = 0;
/* /*
@ -769,9 +770,8 @@ vdev_rebuild_thread(void *arg)
* is not required for a correct rebuild, but we do want rebuilds to * is not required for a correct rebuild, but we do want rebuilds to
* emulate the resilver behavior as much as possible. * emulate the resilver behavior as much as possible.
*/ */
dsl_pool_t *dsl = spa_get_dsl(spa); if (dsl_scan_scrubbing(dp))
if (dsl_scan_scrubbing(dsl)) dsl_scan_cancel(dp);
dsl_scan_cancel(dsl);
spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER); spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
mutex_enter(&vd->vdev_rebuild_lock); mutex_enter(&vd->vdev_rebuild_lock);
@ -853,7 +853,7 @@ vdev_rebuild_thread(void *arg)
if (zfs_range_tree_space(msp->ms_allocating[j])) { if (zfs_range_tree_space(msp->ms_allocating[j])) {
mutex_exit(&msp->ms_lock); mutex_exit(&msp->ms_lock);
mutex_exit(&msp->ms_sync_lock); mutex_exit(&msp->ms_sync_lock);
txg_wait_synced(dsl, 0); txg_wait_synced(dp, 0);
mutex_enter(&msp->ms_sync_lock); mutex_enter(&msp->ms_sync_lock);
mutex_enter(&msp->ms_lock); mutex_enter(&msp->ms_lock);
break; break;
@ -930,7 +930,6 @@ vdev_rebuild_thread(void *arg)
spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER); spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
dsl_pool_t *dp = spa_get_dsl(spa);
dmu_tx_t *tx = dmu_tx_create_dd(dp->dp_mos_dir); dmu_tx_t *tx = dmu_tx_create_dd(dp->dp_mos_dir);
VERIFY0(dmu_tx_assign(tx, DMU_TX_WAIT | DMU_TX_SUSPEND)); VERIFY0(dmu_tx_assign(tx, DMU_TX_WAIT | DMU_TX_SUSPEND));