changeset 21359:3602722f16f8

OS-7798 zfs_zone_zio_dequeue: count==0 console noise during boot commit 90e5050456 Conflicts: usr/src/uts/common/fs/zfs/vdev_queue.c
author Jerry Jelinek <jerry.jelinek@joyent.com>
date Wed, 15 May 2019 17:04:54 +0000
parents d2e64e6e68a8
children 1bc1ea62c4c3
files usr/src/uts/common/fs/zfs/vdev_queue.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/vdev_queue.c	Fri May 24 20:18:39 2019 +0200
+++ b/usr/src/uts/common/fs/zfs/vdev_queue.c	Wed May 15 17:04:54 2019 +0000
@@ -21,7 +21,7 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright 2013 Joyent, Inc. All rights reserved.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -864,9 +864,11 @@
 		spa_t *spa = zio->io_spa;
 		zio_priority_t oldpri = zio->io_priority;
 
+		zfs_zone_zio_dequeue(zio);
 		avl_remove(vdev_queue_class_tree(vq, zio->io_priority), zio);
 		zio->io_priority = priority;
 		avl_add(vdev_queue_class_tree(vq, zio->io_priority), zio);
+		zfs_zone_zio_enqueue(zio);
 
 		mutex_enter(&spa->spa_iokstat_lock);
 		ASSERT3U(spa->spa_queue_stats[oldpri].spa_queued, >, 0);