diff options
| author | Giuseppe Di Natale <[email protected]> | 2018-04-10 10:32:14 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-04-10 10:32:14 -0700 |
| commit | 10f88c5cd523eec8431941abf00017fc8fb67fd3 (patch) | |
| tree | 65c95f0c29cb3677fd246d217d4b55442737f6b1 /module | |
| parent | 74df0c5e251a920a1966a011c16f960cd7ba562e (diff) | |
Linux compat 4.16: blk_queue_flag_{set,clear}
queue_flag_{set,clear}_unlocked are now private interfaces in
the Linux kernel (https://github.com/torvalds/linux/commit/8a0ac14).
Use blk_queue_flag_{set,clear} interfaces which were introduced as
of https://github.com/torvalds/linux/commit/8814ce8.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Giuseppe Di Natale <[email protected]>
Closes #7410
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/zvol.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index d37e9e70a..97b2e4d78 100644 --- a/module/zfs/zvol.c +++ b/module/zfs/zvol.c @@ -1696,7 +1696,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_unlocked(QUEUE_FLAG_NOMERGES, zv->zv_queue); + blk_queue_flag_set(QUEUE_FLAG_NOMERGES, zv->zv_queue); zv->zv_disk = alloc_disk(ZVOL_MINORS); if (zv->zv_disk == NULL) @@ -1847,12 +1847,12 @@ zvol_create_minor_impl(const char *name) blk_queue_max_discard_sectors(zv->zv_queue, (zvol_max_discard_blocks * zv->zv_volblocksize) >> 9); blk_queue_discard_granularity(zv->zv_queue, zv->zv_volblocksize); - queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, zv->zv_queue); + blk_queue_flag_set(QUEUE_FLAG_DISCARD, zv->zv_queue); #ifdef QUEUE_FLAG_NONROT - queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zv->zv_queue); + blk_queue_flag_set(QUEUE_FLAG_NONROT, zv->zv_queue); #endif #ifdef QUEUE_FLAG_ADD_RANDOM - queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, zv->zv_queue); + blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, zv->zv_queue); #endif if (spa_writeable(dmu_objset_spa(os))) { |