block: Introduce blk_queue_flag_{set,clear,test_and_{set,clear}}()

Introduce functions that modify the queue flags and that protect
these modifications with the request queue lock. Except for moving
one wake_up_all() call from inside to outside a critical section,
this patch does not change any functionality.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 7 insertions, 15 deletions

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index fd71a00c9462..d00d1b0ec109 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -276,12 +276,10 @@ queue_store_##name(struct request_queue *q, const char *page, size_t count) \
         if (neg)                                                        \
                 val = !val;                                             \
                                                                         \
-        spin_lock_irq(q->queue_lock);                                   \
         if (val)                                                        \
-                queue_flag_set(QUEUE_FLAG_##flag, q);                   \
+                blk_queue_flag_set(QUEUE_FLAG_##flag, q);               \
         else                                                            \
-                queue_flag_clear(QUEUE_FLAG_##flag, q);                 \
-        spin_unlock_irq(q->queue_lock);                                 \
+                blk_queue_flag_clear(QUEUE_FLAG_##flag, q);             \
         return ret;                                                     \
 }
 
@@ -414,12 +412,10 @@ static ssize_t queue_poll_store(struct request_queue *q, const char *page,
         if (ret < 0)
                 return ret;
 
-        spin_lock_irq(q->queue_lock);
         if (poll_on)
-                queue_flag_set(QUEUE_FLAG_POLL, q);
+                blk_queue_flag_set(QUEUE_FLAG_POLL, q);
         else
-                queue_flag_clear(QUEUE_FLAG_POLL, q);
-        spin_unlock_irq(q->queue_lock);
+                blk_queue_flag_clear(QUEUE_FLAG_POLL, q);
 
         return ret;
 }
@@ -487,12 +483,10 @@ static ssize_t queue_wc_store(struct request_queue *q, const char *page,
         if (set == -1)
                 return -EINVAL;
 
-        spin_lock_irq(q->queue_lock);
         if (set)
-                queue_flag_set(QUEUE_FLAG_WC, q);
+                blk_queue_flag_set(QUEUE_FLAG_WC, q);
         else
-                queue_flag_clear(QUEUE_FLAG_WC, q);
-        spin_unlock_irq(q->queue_lock);
+                blk_queue_flag_clear(QUEUE_FLAG_WC, q);
 
         return count;
 }
@@ -946,9 +940,7 @@ void blk_unregister_queue(struct gendisk *disk)
          */
         mutex_lock(&q->sysfs_lock);
 
-        spin_lock_irq(q->queue_lock);
-        queue_flag_clear(QUEUE_FLAG_REGISTERED, q);
-        spin_unlock_irq(q->queue_lock);
+        blk_queue_flag_clear(QUEUE_FLAG_REGISTERED, q);
 
         /*
          * Remove the sysfs attributes before unregistering the queue data