aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/lock_dlm.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/lock_dlm.c')
-rw-r--r--fs/gfs2/lock_dlm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
index c1eb555dc588..91f274de1246 100644
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@ -1134,7 +1134,7 @@ static void gdlm_recover_done(void *arg, struct dlm_slot *slots, int num_slots,
1134 queue_delayed_work(gfs2_control_wq, &sdp->sd_control_work, 0); 1134 queue_delayed_work(gfs2_control_wq, &sdp->sd_control_work, 0);
1135 1135
1136 clear_bit(DFL_DLM_RECOVERY, &ls->ls_recover_flags); 1136 clear_bit(DFL_DLM_RECOVERY, &ls->ls_recover_flags);
1137 smp_mb__after_clear_bit(); 1137 smp_mb__after_atomic();
1138 wake_up_bit(&ls->ls_recover_flags, DFL_DLM_RECOVERY); 1138 wake_up_bit(&ls->ls_recover_flags, DFL_DLM_RECOVERY);
1139 spin_unlock(&ls->ls_recover_spin); 1139 spin_unlock(&ls->ls_recover_spin);
1140} 1140}
@@ -1271,7 +1271,7 @@ static int gdlm_mount(struct gfs2_sbd *sdp, const char *table)
1271 1271
1272 ls->ls_first = !!test_bit(DFL_FIRST_MOUNT, &ls->ls_recover_flags); 1272 ls->ls_first = !!test_bit(DFL_FIRST_MOUNT, &ls->ls_recover_flags);
1273 clear_bit(SDF_NOJOURNALID, &sdp->sd_flags); 1273 clear_bit(SDF_NOJOURNALID, &sdp->sd_flags);
1274 smp_mb__after_clear_bit(); 1274 smp_mb__after_atomic();
1275 wake_up_bit(&sdp->sd_flags, SDF_NOJOURNALID); 1275 wake_up_bit(&sdp->sd_flags, SDF_NOJOURNALID);
1276 return 0; 1276 return 0;
1277 1277