diff options
-rw-r--r-- | fs/gfs2/glock.c | 3 | ||||
-rw-r--r-- | fs/gfs2/log.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index d83df6888402..a7f3c462d4fe 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
@@ -217,7 +217,6 @@ int gfs2_glock_put(struct gfs2_glock *gl) | |||
217 | if (atomic_dec_and_test(&gl->gl_ref)) { | 217 | if (atomic_dec_and_test(&gl->gl_ref)) { |
218 | hlist_del(&gl->gl_list); | 218 | hlist_del(&gl->gl_list); |
219 | write_unlock(gl_lock_addr(gl->gl_hash)); | 219 | write_unlock(gl_lock_addr(gl->gl_hash)); |
220 | BUG_ON(spin_is_locked(&gl->gl_spin)); | ||
221 | gfs2_assert(sdp, gl->gl_state == LM_ST_UNLOCKED); | 220 | gfs2_assert(sdp, gl->gl_state == LM_ST_UNLOCKED); |
222 | gfs2_assert(sdp, list_empty(&gl->gl_reclaim)); | 221 | gfs2_assert(sdp, list_empty(&gl->gl_reclaim)); |
223 | gfs2_assert(sdp, list_empty(&gl->gl_holders)); | 222 | gfs2_assert(sdp, list_empty(&gl->gl_holders)); |
@@ -460,7 +459,6 @@ static void wait_on_holder(struct gfs2_holder *gh) | |||
460 | 459 | ||
461 | static void gfs2_demote_wake(struct gfs2_glock *gl) | 460 | static void gfs2_demote_wake(struct gfs2_glock *gl) |
462 | { | 461 | { |
463 | BUG_ON(!spin_is_locked(&gl->gl_spin)); | ||
464 | gl->gl_demote_state = LM_ST_EXCLUSIVE; | 462 | gl->gl_demote_state = LM_ST_EXCLUSIVE; |
465 | clear_bit(GLF_DEMOTE, &gl->gl_flags); | 463 | clear_bit(GLF_DEMOTE, &gl->gl_flags); |
466 | smp_mb__after_clear_bit(); | 464 | smp_mb__after_clear_bit(); |
@@ -680,7 +678,6 @@ static void gfs2_glmutex_unlock(struct gfs2_glock *gl) | |||
680 | gl->gl_owner_pid = 0; | 678 | gl->gl_owner_pid = 0; |
681 | gl->gl_ip = 0; | 679 | gl->gl_ip = 0; |
682 | run_queue(gl); | 680 | run_queue(gl); |
683 | BUG_ON(!spin_is_locked(&gl->gl_spin)); | ||
684 | spin_unlock(&gl->gl_spin); | 681 | spin_unlock(&gl->gl_spin); |
685 | } | 682 | } |
686 | 683 | ||
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 4dcc7a8cda22..96dcf050e6c9 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c | |||
@@ -92,8 +92,6 @@ static void gfs2_ail1_start_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai) | |||
92 | struct buffer_head *bh; | 92 | struct buffer_head *bh; |
93 | int retry; | 93 | int retry; |
94 | 94 | ||
95 | BUG_ON(!spin_is_locked(&sdp->sd_log_lock)); | ||
96 | |||
97 | do { | 95 | do { |
98 | retry = 0; | 96 | retry = 0; |
99 | 97 | ||