diff options
| author | sanjeevbagewadi <[email protected]> | 2018-02-13 01:00:38 +0530 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-02-12 11:30:38 -0800 |
| commit | 918dbe35b50649edfce85d61b122be1510152433 (patch) | |
| tree | 01c9cf8ad2db97dbd0b03e884b48810fbebc3ef5 | |
| parent | ba779f7f7102bf9cc96eb7c7ba577e283d1a0f63 (diff) | |
mmp should use a fixed tag for spa_config locks
mmp_write_uberblock() and mmp_write_done() should the same tag
for spa_config_locks.
Reviewed-by: Olaf Faaland <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed by: Brian Behlendorf <[email protected]>
Signed-off-by: Sanjeev Bagewadi <[email protected]>
Closes #6530
Closes #7155
| -rw-r--r-- | module/zfs/mmp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/module/zfs/mmp.c b/module/zfs/mmp.c index d13d1590f..986e4f7dc 100644 --- a/module/zfs/mmp.c +++ b/module/zfs/mmp.c @@ -124,6 +124,7 @@ uint_t zfs_multihost_import_intervals = MMP_DEFAULT_IMPORT_INTERVALS; */ uint_t zfs_multihost_fail_intervals = MMP_DEFAULT_FAIL_INTERVALS; +char *mmp_tag = "mmp_write_uberblock"; static void mmp_thread(void *arg); void @@ -278,7 +279,7 @@ mmp_write_done(zio_t *zio) unlock: mutex_exit(&mts->mmp_io_lock); - spa_config_exit(spa, SCL_STATE, FTAG); + spa_config_exit(spa, SCL_STATE, mmp_tag); abd_free(zio->io_abd); } @@ -314,7 +315,7 @@ mmp_write_uberblock(spa_t *spa) int label; uint64_t offset; - spa_config_enter(spa, SCL_STATE, FTAG, RW_READER); + spa_config_enter(spa, SCL_STATE, mmp_tag, RW_READER); vd = mmp_random_leaf(spa->spa_root_vdev); if (vd == NULL) { spa_config_exit(spa, SCL_STATE, FTAG); |