mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
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: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
11c8f01b42
commit
8f6cb409f0
1 changed files with 3 additions and 10 deletions
|
@ -173,19 +173,14 @@ void gfs2_glock_add_to_lru(struct gfs2_glock *gl)
|
||||||
spin_unlock(&lru_lock);
|
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)) {
|
if (!list_empty(&gl->gl_lru)) {
|
||||||
list_del_init(&gl->gl_lru);
|
list_del_init(&gl->gl_lru);
|
||||||
atomic_dec(&lru_count);
|
atomic_dec(&lru_count);
|
||||||
clear_bit(GLF_LRU, &gl->gl_flags);
|
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);
|
spin_unlock(&lru_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,9 +200,7 @@ void gfs2_glock_put(struct gfs2_glock *gl)
|
||||||
|
|
||||||
lockref_mark_dead(&gl->gl_lockref);
|
lockref_mark_dead(&gl->gl_lockref);
|
||||||
|
|
||||||
spin_lock(&lru_lock);
|
gfs2_glock_remove_from_lru(gl);
|
||||||
__gfs2_glock_remove_from_lru(gl);
|
|
||||||
spin_unlock(&lru_lock);
|
|
||||||
spin_unlock(&gl->gl_lockref.lock);
|
spin_unlock(&gl->gl_lockref.lock);
|
||||||
spin_lock_bucket(gl->gl_hash);
|
spin_lock_bucket(gl->gl_hash);
|
||||||
hlist_bl_del_rcu(&gl->gl_list);
|
hlist_bl_del_rcu(&gl->gl_list);
|
||||||
|
|
Loading…
Reference in a new issue