UPSTREAM: selinux: Remove unnecessary check of array base in selinux_set_mapping()

[GitHub/LineageOS/android_kernel_samsung_universal7580.git] / block / blk-iopoll.c

diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
index 58916afbbda5d9801fc4f960d0b9b003e1112bee..2d4d8d56744123f931d45e47d56bed32937d77e8 100644 (file)
--- a/block/blk-iopoll.c
+++ b/block/blk-iopoll.c
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(blk_iopoll_sched);
 void __blk_iopoll_complete(struct blk_iopoll *iop)
 {
        list_del(&iop->list);
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        clear_bit_unlock(IOPOLL_F_SCHED, &iop->state);
 }
 EXPORT_SYMBOL(__blk_iopoll_complete);
@@ -164,7 +164,7 @@ EXPORT_SYMBOL(blk_iopoll_disable);
 void blk_iopoll_enable(struct blk_iopoll *iop)
 {
        BUG_ON(!test_bit(IOPOLL_F_SCHED, &iop->state));
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        clear_bit_unlock(IOPOLL_F_SCHED, &iop->state);
 }
 EXPORT_SYMBOL(blk_iopoll_enable);