From ef4be34a64010fb57632e1bc317810c86feacc67 Mon Sep 17 00:00:00 2001 From: Boris Protopopov Date: Wed, 14 Jun 2017 16:18:36 -0400 Subject: [PATCH] Avoid 'queue not locked' warning at pool import. Use queue_flag_set_unlocked() in zvol_alloc(). Reviewed-by: Brian Behlendorf Signed-off-by: Boris Protopopov Issue #6226 --- module/zfs/zvol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index 7730c28c6..8890aaaf7 100644 --- a/module/zfs/zvol.c +++ b/module/zfs/zvol.c @@ -1527,7 +1527,7 @@ zvol_alloc(dev_t dev, const char *name) blk_queue_set_read_ahead(zv->zv_queue, 1); /* Disable write merging in favor of the ZIO pipeline. */ - queue_flag_set(QUEUE_FLAG_NOMERGES, zv->zv_queue); + queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, zv->zv_queue); zv->zv_disk = alloc_disk(ZVOL_MINORS); if (zv->zv_disk == NULL)