diff options
| author | Boris Protopopov <[email protected]> | 2017-06-14 16:18:36 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-06-15 11:16:19 -0700 |
| commit | ef4be34a64010fb57632e1bc317810c86feacc67 (patch) | |
| tree | fb600c6da7025091f4834e644fb22b24e043be71 | |
| parent | 97f8d7961e0b6e282f5296c20d5af9746c9db688 (diff) | |
Avoid 'queue not locked' warning at pool import.
Use queue_flag_set_unlocked() in zvol_alloc().
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Boris Protopopov <[email protected]>
Issue #6226
| -rw-r--r-- | module/zfs/zvol.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |