Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73cc8625 authored by Bob Peterson's avatar Bob Peterson
Browse files

GFS2: Get rid of dead code in inode_go_demote_ok 



Function inode_go_demote_ok had some code that was only executed
if gl_holders was not empty. However, if gl_holders was not empty,
the only caller, demote_ok(), returns before inode_go_demote_ok
would ever be called. Therefore, it's dead code, so I removed it.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Acked-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 3e11e530

fs/gfs2/glops.c

+0 −7
Original line number Diff line number Diff line
@@ -286,17 +286,10 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags) 
static int inode_go_demote_ok(const struct gfs2_glock *gl)

{

	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;

	struct gfs2_holder *gh;



	if (sdp->sd_jindex == gl->gl_object || sdp->sd_rindex == gl->gl_object)

		return 0;



	if (!list_empty(&gl->gl_holders)) {

		gh = list_entry(gl->gl_holders.next, struct gfs2_holder, gh_list);

		if (gh->gh_list.next != &gl->gl_holders)

			return 0;

	}



	return 1;

}