1 files changed, 7 insertions, 4 deletions

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 8606c9543fdd..e85442415db3 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -189,7 +189,8 @@ static ssize_t queue_nonrot_store(struct request_queue *q, const char *page,
 
 static ssize_t queue_nomerges_show(struct request_queue *q, char *page)
 {
-        return queue_var_show(blk_queue_nomerges(q), page);
+        return queue_var_show((blk_queue_nomerges(q) << 1) |
+                               blk_queue_noxmerges(q), page);
 }
 
 static ssize_t queue_nomerges_store(struct request_queue *q, const char *page,
@@ -199,10 +200,12 @@ static ssize_t queue_nomerges_store(struct request_queue *q, const char *page,
         ssize_t ret = queue_var_store(&nm, page, count);
 
         spin_lock_irq(q->queue_lock);
-        if (nm)
+        queue_flag_clear(QUEUE_FLAG_NOMERGES, q);
+        queue_flag_clear(QUEUE_FLAG_NOXMERGES, q);
+        if (nm == 2)
                 queue_flag_set(QUEUE_FLAG_NOMERGES, q);
-        else
-                queue_flag_clear(QUEUE_FLAG_NOMERGES, q);
+        else if (nm)
+                queue_flag_set(QUEUE_FLAG_NOXMERGES, q);
         spin_unlock_irq(q->queue_lock);
 
         return ret;