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>

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/lru_cache.c b/lib/lru_cache.c
index a07e7268d7ed..9f353f7f41ca 100644
--- a/lib/lru_cache.c
+++ b/lib/lru_cache.c
@@ -44,8 +44,8 @@ MODULE_LICENSE("GPL");
 } while (0)
 
 #define RETURN(x...)     do { \
-        clear_bit(__LC_PARANOIA, &lc->flags); \
-        smp_mb__after_clear_bit(); return x ; } while (0)
+        clear_bit_unlock(__LC_PARANOIA, &lc->flags); \
+        return x ; } while (0)
 
 /* BUG() if e is not one of the elements tracked by lc */
 #define PARANOIA_LC_ELEMENT(lc, e) do { \
@@ -438,8 +438,7 @@ void lc_changed(struct lru_cache *lc, struct lc_element *e)
         hlist_add_head(&e->colision, lc_hash_slot(lc, lc->new_number));
         lc->changing_element = NULL;
         lc->new_number = LC_FREE;
-        clear_bit(__LC_DIRTY, &lc->flags);
-        smp_mb__after_clear_bit();
+        clear_bit_unlock(__LC_DIRTY, &lc->flags);
         RETURN();
 }
 
@@ -463,8 +462,7 @@ unsigned int lc_put(struct lru_cache *lc, struct lc_element *e)
                 /* move it to the front of LRU. */
                 list_move(&e->list, &lc->lru);
                 lc->used--;
-                clear_bit(__LC_STARVING, &lc->flags);
-                smp_mb__after_clear_bit();
+                clear_bit_unlock(__LC_STARVING, &lc->flags);
         }
         RETURN(e->refcnt);
 }