dm bio prison: replace spin_lock_irqsave with spin_lock_irq

Replace spin_lock_irqsave/irqrestore with spin_lock_irq/spin_unlock_irq.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

diff --git a/drivers/md/dm-bio-prison-v1.c b/drivers/md/dm-bio-prison-v1.c
index b538989..1f8f98e 100644 (file)
--- a/drivers/md/dm-bio-prison-v1.c
+++ b/drivers/md/dm-bio-prison-v1.c
@@ -150,11 +150,10 @@ static int bio_detain(struct dm_bio_prison *prison,
                      struct dm_bio_prison_cell **cell_result)
 {
        int r;
-       unsigned long flags;
 
-       spin_lock_irqsave(&prison->lock, flags);
+       spin_lock_irq(&prison->lock);
        r = __bio_detain(prison, key, inmate, cell_prealloc, cell_result);
-       spin_unlock_irqrestore(&prison->lock, flags);
+       spin_unlock_irq(&prison->lock);
 
        return r;
 }
@@ -198,11 +197,9 @@ void dm_cell_release(struct dm_bio_prison *prison,
                     struct dm_bio_prison_cell *cell,
                     struct bio_list *bios)
 {
-       unsigned long flags;
-
-       spin_lock_irqsave(&prison->lock, flags);
+       spin_lock_irq(&prison->lock);
        __cell_release(prison, cell, bios);
-       spin_unlock_irqrestore(&prison->lock, flags);
+       spin_unlock_irq(&prison->lock);
 }
 EXPORT_SYMBOL_GPL(dm_cell_release);
 
@@ -250,12 +247,10 @@ void dm_cell_visit_release(struct dm_bio_prison *prison,
                           void *context,
                           struct dm_bio_prison_cell *cell)
 {
-       unsigned long flags;
-
-       spin_lock_irqsave(&prison->lock, flags);
+       spin_lock_irq(&prison->lock);
        visit_fn(context, cell);
        rb_erase(&cell->node, &prison->cells);
-       spin_unlock_irqrestore(&prison->lock, flags);
+       spin_unlock_irq(&prison->lock);
 }
 EXPORT_SYMBOL_GPL(dm_cell_visit_release);
 
@@ -275,11 +270,10 @@ int dm_cell_promote_or_release(struct dm_bio_prison *prison,
                               struct dm_bio_prison_cell *cell)
 {
        int r;
-       unsigned long flags;
 
-       spin_lock_irqsave(&prison->lock, flags);
+       spin_lock_irq(&prison->lock);
        r = __promote_or_release(prison, cell);
-       spin_unlock_irqrestore(&prison->lock, flags);
+       spin_unlock_irq(&prison->lock);
 
        return r;
 }
@@ -379,10 +373,9 @@ EXPORT_SYMBOL_GPL(dm_deferred_entry_dec);
 int dm_deferred_set_add_work(struct dm_deferred_set *ds, struct list_head *work)
 {
        int r = 1;
-       unsigned long flags;
        unsigned next_entry;
 
-       spin_lock_irqsave(&ds->lock, flags);
+       spin_lock_irq(&ds->lock);
        if ((ds->sweeper == ds->current_entry) &&
            !ds->entries[ds->current_entry].count)
                r = 0;
@@ -392,7 +385,7 @@ int dm_deferred_set_add_work(struct dm_deferred_set *ds, struct list_head *work)
                if (!ds->entries[next_entry].count)
                        ds->current_entry = next_entry;
        }
-       spin_unlock_irqrestore(&ds->lock, flags);
+       spin_unlock_irq(&ds->lock);
 
        return r;
 }

diff --git a/drivers/md/dm-bio-prison-v2.c b/drivers/md/dm-bio-prison-v2.c
index b092cdc..8ee019e 100644 (file)
--- a/drivers/md/dm-bio-prison-v2.c
+++ b/drivers/md/dm-bio-prison-v2.c
@@ -177,11 +177,10 @@ bool dm_cell_get_v2(struct dm_bio_prison_v2 *prison,
                    struct dm_bio_prison_cell_v2 **cell_result)
 {
        int r;
-       unsigned long flags;
 
-       spin_lock_irqsave(&prison->lock, flags);
+       spin_lock_irq(&prison->lock);
        r = __get(prison, key, lock_level, inmate, cell_prealloc, cell_result);
-       spin_unlock_irqrestore(&prison->lock, flags);
+       spin_unlock_irq(&prison->lock);
 
        return r;
 }
@@ -261,11 +260,10 @@ int dm_cell_lock_v2(struct dm_bio_prison_v2 *prison,
                    struct dm_bio_prison_cell_v2 **cell_result)
 {
        int r;
-       unsigned long flags;
 
-       spin_lock_irqsave(&prison->lock, flags);
+       spin_lock_irq(&prison->lock);
        r = __lock(prison, key, lock_level, cell_prealloc, cell_result);
-       spin_unlock_irqrestore(&prison->lock, flags);
+       spin_unlock_irq(&prison->lock);
 
        return r;
 }
@@ -285,11 +283,9 @@ void dm_cell_quiesce_v2(struct dm_bio_prison_v2 *prison,
                        struct dm_bio_prison_cell_v2 *cell,
                        struct work_struct *continuation)
 {
-       unsigned long flags;
-
-       spin_lock_irqsave(&prison->lock, flags);
+       spin_lock_irq(&prison->lock);
        __quiesce(prison, cell, continuation);
-       spin_unlock_irqrestore(&prison->lock, flags);
+       spin_unlock_irq(&prison->lock);
 }
 EXPORT_SYMBOL_GPL(dm_cell_quiesce_v2);
 
@@ -309,11 +305,10 @@ int dm_cell_lock_promote_v2(struct dm_bio_prison_v2 *prison,
                            unsigned new_lock_level)
 {
        int r;
-       unsigned long flags;
 
-       spin_lock_irqsave(&prison->lock, flags);
+       spin_lock_irq(&prison->lock);
        r = __promote(prison, cell, new_lock_level);
-       spin_unlock_irqrestore(&prison->lock, flags);
+       spin_unlock_irq(&prison->lock);
 
        return r;
 }
@@ -342,11 +337,10 @@ bool dm_cell_unlock_v2(struct dm_bio_prison_v2 *prison,
                       struct bio_list *bios)
 {
        bool r;
-       unsigned long flags;
 
-       spin_lock_irqsave(&prison->lock, flags);
+       spin_lock_irq(&prison->lock);
        r = __unlock(prison, cell, bios);
-       spin_unlock_irqrestore(&prison->lock, flags);
+       spin_unlock_irq(&prison->lock);
 
        return r;
 }