drbd: use clear_bit_unlock() where appropriate

Some open-coded clear_bit(); smp_mb__after_clear_bit();
should in fact have been smp_mb__before_clear_bit(); clear_bit();

Instead, use clear_bit_unlock() to annotate the intention,
and have it do the right thing.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

2 files changed, 2 insertions, 4 deletions

diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index e8d652f197c3..4be737055718 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -219,8 +219,7 @@ static void bm_page_unlock_io(struct drbd_conf *mdev, int page_nr)
 {
         struct drbd_bitmap *b = mdev->bitmap;
         void *addr = &page_private(b->bm_pages[page_nr]);
-        clear_bit(BM_PAGE_IO_LOCK, addr);
-        smp_mb__after_clear_bit();
+        clear_bit_unlock(BM_PAGE_IO_LOCK, addr);
         wake_up(&mdev->bitmap->bm_io_wait);
 }
 
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 592f0c949fd0..c77e51a40926 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2818,8 +2818,7 @@ static int w_bitmap_io(struct drbd_work *w, int unused)
                 put_ldev(mdev);
         }
 
-        clear_bit(BITMAP_IO, &mdev->flags);
-        smp_mb__after_clear_bit();
+        clear_bit_unlock(BITMAP_IO, &mdev->flags);
         wake_up(&mdev->misc_wait);
 
         if (work->done)