GFS2: Review bug traps in glops.c
Two of the bug traps here could really be warnings. The others are converted from BUG() to GLOCK_BUG_ON() since we'll most likely need to know the glock state in order to debug any issues which arise. As a result of this, __dump_glock has to be renamed and is no longer static. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
@@ -74,7 +74,7 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync)
|
||||
|
||||
gfs2_trans_add_revoke(sdp, bd);
|
||||
}
|
||||
BUG_ON(!fsync && atomic_read(&gl->gl_ail_count));
|
||||
GLOCK_BUG_ON(gl, !fsync && atomic_read(&gl->gl_ail_count));
|
||||
spin_unlock(&sdp->sd_ail_lock);
|
||||
gfs2_log_unlock(sdp);
|
||||
}
|
||||
@@ -96,7 +96,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl)
|
||||
tr.tr_ip = (unsigned long)__builtin_return_address(0);
|
||||
sb_start_intwrite(sdp->sd_vfs);
|
||||
gfs2_log_reserve(sdp, tr.tr_reserved);
|
||||
BUG_ON(current->journal_info);
|
||||
WARN_ON_ONCE(current->journal_info);
|
||||
current->journal_info = &tr;
|
||||
|
||||
__gfs2_ail_flush(gl, 0);
|
||||
@@ -139,7 +139,7 @@ static void rgrp_go_sync(struct gfs2_glock *gl)
|
||||
|
||||
if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))
|
||||
return;
|
||||
BUG_ON(gl->gl_state != LM_ST_EXCLUSIVE);
|
||||
GLOCK_BUG_ON(gl, gl->gl_state != LM_ST_EXCLUSIVE);
|
||||
|
||||
gfs2_log_flush(gl->gl_sbd, gl);
|
||||
filemap_fdatawrite(metamapping);
|
||||
@@ -168,7 +168,7 @@ static void rgrp_go_inval(struct gfs2_glock *gl, int flags)
|
||||
{
|
||||
struct address_space *mapping = gfs2_glock2aspace(gl);
|
||||
|
||||
BUG_ON(!(flags & DIO_METADATA));
|
||||
WARN_ON_ONCE(!(flags & DIO_METADATA));
|
||||
gfs2_assert_withdraw(gl->gl_sbd, !atomic_read(&gl->gl_ail_count));
|
||||
truncate_inode_pages(mapping, 0);
|
||||
|
||||
@@ -197,7 +197,7 @@ static void inode_go_sync(struct gfs2_glock *gl)
|
||||
if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))
|
||||
return;
|
||||
|
||||
BUG_ON(gl->gl_state != LM_ST_EXCLUSIVE);
|
||||
GLOCK_BUG_ON(gl, gl->gl_state != LM_ST_EXCLUSIVE);
|
||||
|
||||
gfs2_log_flush(gl->gl_sbd, gl);
|
||||
filemap_fdatawrite(metamapping);
|
||||
|
Reference in New Issue
Block a user