summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/CMakeLists.txt1
-rw-r--r--src/kernel/blk.c11
2 files changed, 8 insertions, 4 deletions
diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index 6bc61ff..24a7d2c 100644
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -53,6 +53,7 @@ set(CHECKPATCH_IGNORE_WARNINGS "NEW_TYPEDEFS"
"PREFER_PR_LEVEL"
"LINUX_VERSION_CODE"
"JIFFIES_COMPARISON"
+ "MACRO_ARG_UNUSED"
"KREALLOC_ARG_REUSE")
add_kernel_linter(dnbd3-lint "${CHECKPATCH_IGNORE_WARNINGS}"
diff --git a/src/kernel/blk.c b/src/kernel/blk.c
index 8c6f9a0..eaed1cd 100644
--- a/src/kernel/blk.c
+++ b/src/kernel/blk.c
@@ -30,7 +30,6 @@
static int dnbd3_close_device(dnbd3_device_t *dev)
{
int result;
- unsigned int mf;
if (dev->imgname)
dev_info(dnbd3_device_to_dev(dev), "closing down device.\n");
@@ -47,9 +46,13 @@ static int dnbd3_close_device(dnbd3_device_t *dev)
set_capacity(dev->disk, 0);
blk_mq_unfreeze_queue(dev->queue);
#else
- mf = blk_mq_freeze_queue(dev->queue);
- set_capacity(dev->disk, 0);
- blk_mq_unfreeze_queue(dev->queue, mf);
+ {
+ unsigned int mf;
+
+ mf = blk_mq_freeze_queue(dev->queue);
+ set_capacity(dev->disk, 0);
+ blk_mq_unfreeze_queue(dev->queue, mf);
+ }
#endif
return result;
}