Merge tag 'dm-3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[linux-2.6-block.git] / drivers / md / dm-snap.c

diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index e5a84c890e8f0a1d1b424ed3315c755763871cdf..5bd2290cfb1e21b73790a0543888bc8b394c83ea 100644 (file)
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -642,7 +642,7 @@ static void free_pending_exception(struct dm_snap_pending_exception *pe)
        struct dm_snapshot *s = pe->snap;
 
        mempool_free(pe, s->pending_pool);
-       smp_mb__before_atomic_dec();
+       smp_mb__before_atomic();
        atomic_dec(&s->pending_exceptions_count);
 }
 
@@ -783,7 +783,7 @@ static int init_hash_tables(struct dm_snapshot *s)
 static void merge_shutdown(struct dm_snapshot *s)
 {
        clear_bit_unlock(RUNNING_MERGE, &s->state_bits);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
        wake_up_bit(&s->state_bits, RUNNING_MERGE);
 }