From 75058f33034d23801818582996d3dc941c545910 Mon Sep 17 00:00:00 2001 From: Serapheim Dimitropoulos Date: Thu, 17 Jan 2019 15:41:12 -0800 Subject: [PATCH] Remove unused vdev_t fields The following fields from the vdev_t struct are not used anywhere. Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Reviewed-by: Tony Hutter Signed-off-by: Serapheim Dimitropoulos Closes #8285 --- include/sys/vdev_impl.h | 11 ----------- module/zfs/vdev.c | 2 -- 2 files changed, 13 deletions(-) diff --git a/include/sys/vdev_impl.h b/include/sys/vdev_impl.h index 5fe05c54b21e..8f8a8ccf608e 100644 --- a/include/sys/vdev_impl.h +++ b/include/sys/vdev_impl.h @@ -254,7 +254,6 @@ struct vdev { uint64_t vdev_islog; /* is an intent log device */ uint64_t vdev_removing; /* device is being removed? */ boolean_t vdev_ishole; /* is a hole in the namespace */ - kmutex_t vdev_queue_lock; /* protects vdev_queue_depth */ uint64_t vdev_top_zap; vdev_alloc_bias_t vdev_alloc_bias; /* metaslab allocation bias */ @@ -314,16 +313,6 @@ struct vdev { range_tree_t *vdev_obsolete_segments; space_map_t *vdev_obsolete_sm; - /* - * The queue depth parameters determine how many async writes are - * still pending (i.e. allocated but not yet issued to disk) per - * top-level (vdev_async_write_queue_depth) and the maximum allowed - * (vdev_max_async_write_queue_depth). These values only apply to - * top-level vdevs. - */ - uint64_t vdev_async_write_queue_depth; - uint64_t vdev_max_async_write_queue_depth; - /* * Protects the vdev_scan_io_queue field itself as well as the * structure's contents (when present). diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index cf49172d5f23..64fc6fadd427 100644 --- a/module/zfs/vdev.c +++ b/module/zfs/vdev.c @@ -534,7 +534,6 @@ vdev_alloc_common(spa_t *spa, uint_t id, uint64_t guid, vdev_ops_t *ops) mutex_init(&vd->vdev_dtl_lock, NULL, MUTEX_NOLOCKDEP, NULL); mutex_init(&vd->vdev_stat_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&vd->vdev_probe_lock, NULL, MUTEX_DEFAULT, NULL); - mutex_init(&vd->vdev_queue_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&vd->vdev_scan_io_queue_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&vd->vdev_initialize_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&vd->vdev_initialize_io_lock, NULL, MUTEX_DEFAULT, NULL); @@ -968,7 +967,6 @@ vdev_free(vdev_t *vd) rw_destroy(&vd->vdev_indirect_rwlock); mutex_destroy(&vd->vdev_obsolete_lock); - mutex_destroy(&vd->vdev_queue_lock); mutex_destroy(&vd->vdev_dtl_lock); mutex_destroy(&vd->vdev_stat_lock); mutex_destroy(&vd->vdev_probe_lock);