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

Commit 8f6cb409 authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

GFS2: Eliminate __gfs2_glock_remove_from_lru 



Since the only caller of function __gfs2_glock_remove_from_lru locks the
same spin_lock as gfs2_glock_remove_from_lru, the functions can be combined.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 11c8f01b

fs/gfs2/glock.c

+3 −10
Original line number Diff line number Diff line
@@ -173,19 +173,14 @@ void gfs2_glock_add_to_lru(struct gfs2_glock *gl) 
	spin_unlock(&lru_lock);

}



static void __gfs2_glock_remove_from_lru(struct gfs2_glock *gl)

static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)

{

	spin_lock(&lru_lock);

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

		list_del_init(&gl->gl_lru);

		atomic_dec(&lru_count);

		clear_bit(GLF_LRU, &gl->gl_flags);

	}

}



static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)

{

	spin_lock(&lru_lock);

	__gfs2_glock_remove_from_lru(gl);

	spin_unlock(&lru_lock);

}
@@ -205,9 +200,7 @@ void gfs2_glock_put(struct gfs2_glock *gl) 


	lockref_mark_dead(&gl->gl_lockref);



	spin_lock(&lru_lock);

	__gfs2_glock_remove_from_lru(gl);

	spin_unlock(&lru_lock);

	gfs2_glock_remove_from_lru(gl);

	spin_unlock(&gl->gl_lockref.lock);

	spin_lock_bucket(gl->gl_hash);

	hlist_bl_del_rcu(&gl->gl_list);