Remove unused vdev_t fields

The following fields from the vdev_t struct are not used anywhere.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Closes #8285

diff --git a/include/sys/vdev_impl.h b/include/sys/vdev_impl.h
index 5fe05c54b21e67eeca056e16b86fe1770450e71b..8f8a8ccf608efbf14ffb0e9b43554fbe6a0b1386 100644 (file)
--- 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 cf49172d5f235ddee3c632327efd47781457d5f6..64fc6fadd42799d2b66177574742129dcc06494e 100644 (file)
--- 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);