Avoid 'queue not locked' warning at pool import.

Use queue_flag_set_unlocked() in zvol_alloc().

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Boris Protopopov <boris.protopopov@actifio.com>
Issue #6226

diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index 7730c28c62767f1ff4daeba79ec2a3f158cfcd29..8890aaaf78a3aaa42aedd5d2f137dcc73e408e39 100644 (file)
--- 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)