forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/md/dm-bio-prison-v2.c
....@@ -177,11 +177,10 @@
177177 struct dm_bio_prison_cell_v2 **cell_result)
178178 {
179179 int r;
180
- unsigned long flags;
181180
182
- spin_lock_irqsave(&prison->lock, flags);
181
+ spin_lock_irq(&prison->lock);
183182 r = __get(prison, key, lock_level, inmate, cell_prealloc, cell_result);
184
- spin_unlock_irqrestore(&prison->lock, flags);
183
+ spin_unlock_irq(&prison->lock);
185184
186185 return r;
187186 }
....@@ -261,11 +260,10 @@
261260 struct dm_bio_prison_cell_v2 **cell_result)
262261 {
263262 int r;
264
- unsigned long flags;
265263
266
- spin_lock_irqsave(&prison->lock, flags);
264
+ spin_lock_irq(&prison->lock);
267265 r = __lock(prison, key, lock_level, cell_prealloc, cell_result);
268
- spin_unlock_irqrestore(&prison->lock, flags);
266
+ spin_unlock_irq(&prison->lock);
269267
270268 return r;
271269 }
....@@ -285,11 +283,9 @@
285283 struct dm_bio_prison_cell_v2 *cell,
286284 struct work_struct *continuation)
287285 {
288
- unsigned long flags;
289
-
290
- spin_lock_irqsave(&prison->lock, flags);
286
+ spin_lock_irq(&prison->lock);
291287 __quiesce(prison, cell, continuation);
292
- spin_unlock_irqrestore(&prison->lock, flags);
288
+ spin_unlock_irq(&prison->lock);
293289 }
294290 EXPORT_SYMBOL_GPL(dm_cell_quiesce_v2);
295291
....@@ -309,11 +305,10 @@
309305 unsigned new_lock_level)
310306 {
311307 int r;
312
- unsigned long flags;
313308
314
- spin_lock_irqsave(&prison->lock, flags);
309
+ spin_lock_irq(&prison->lock);
315310 r = __promote(prison, cell, new_lock_level);
316
- spin_unlock_irqrestore(&prison->lock, flags);
311
+ spin_unlock_irq(&prison->lock);
317312
318313 return r;
319314 }
....@@ -329,7 +324,7 @@
329324 bio_list_init(&cell->bios);
330325
331326 if (cell->shared_count) {
332
- cell->exclusive_lock = 0;
327
+ cell->exclusive_lock = false;
333328 return false;
334329 }
335330
....@@ -342,11 +337,10 @@
342337 struct bio_list *bios)
343338 {
344339 bool r;
345
- unsigned long flags;
346340
347
- spin_lock_irqsave(&prison->lock, flags);
341
+ spin_lock_irq(&prison->lock);
348342 r = __unlock(prison, cell, bios);
349
- spin_unlock_irqrestore(&prison->lock, flags);
343
+ spin_unlock_irq(&prison->lock);
350344
351345 return r;
352346 }