Commit 21d9067e authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Get rid of the gfs2_glock_is_held_* helpers 



Those helpers don't add any clarity and are easy to use wrong.  Spell
them out to make more obvious what's happening.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent b4bf3d5c

fs/gfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int gfs2_jdata_writepage(struct page *page, struct writeback_control *wbc 
	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);



	if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl)))

	if (gfs2_assert_withdraw(sdp, ip->i_gl->gl_state == LM_ST_EXCLUSIVE))

		goto out;

	if (folio_test_checked(folio) || current->journal_info)

		goto out_ignore;

fs/gfs2/glock.h

+0 −15
Original line number Diff line number Diff line
@@ -156,21 +156,6 @@ static inline struct gfs2_holder *gfs2_glock_is_locked_by_me(struct gfs2_glock * 
	return gh;

}



static inline int gfs2_glock_is_held_excl(struct gfs2_glock *gl)

{

	return gl->gl_state == LM_ST_EXCLUSIVE;

}



static inline int gfs2_glock_is_held_dfrd(struct gfs2_glock *gl)

{

	return gl->gl_state == LM_ST_DEFERRED;

}



static inline int gfs2_glock_is_held_shrd(struct gfs2_glock *gl)

{

	return gl->gl_state == LM_ST_SHARED;

}



static inline struct address_space *gfs2_glock2aspace(struct gfs2_glock *gl)

{

	if (gl->gl_ops->go_flags & GLOF_ASPACE) {

fs/gfs2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2153,7 +2153,7 @@ static int gfs2_update_time(struct inode *inode, int flags) 
	int error;



	gh = gfs2_glock_is_locked_by_me(gl);

	if (gh && !gfs2_glock_is_held_excl(gl)) {

	if (gh && gl->gl_state != LM_ST_EXCLUSIVE) {

		gfs2_glock_dq(gh);

		gfs2_holder_reinit(LM_ST_EXCLUSIVE, 0, gh);

		error = gfs2_glock_nq(gh);