* [Cluster-devel] [GFS2 PATCH] GFS2: Eliminate __gfs2_glock_remove_from_lru [not found] <652811562.3989950.1420482199546.JavaMail.zimbra@redhat.com> @ 2015-01-05 18:25 ` Bob Peterson 2015-01-09 16:49 ` Steven Whitehouse 0 siblings, 1 reply; 2+ messages in thread From: Bob Peterson @ 2015-01-05 18:25 UTC (permalink / raw) To: cluster-devel.redhat.com Hi, 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. Regards, Bob Peterson Red Hat File Systems Signed-off-by: Bob Peterson <rpeterso@redhat.com> --- diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index a23524a..aeb7bc9 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -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); ^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Cluster-devel] [GFS2 PATCH] GFS2: Eliminate __gfs2_glock_remove_from_lru 2015-01-05 18:25 ` [Cluster-devel] [GFS2 PATCH] GFS2: Eliminate __gfs2_glock_remove_from_lru Bob Peterson @ 2015-01-09 16:49 ` Steven Whitehouse 0 siblings, 0 replies; 2+ messages in thread From: Steven Whitehouse @ 2015-01-09 16:49 UTC (permalink / raw) To: cluster-devel.redhat.com Hi, Now in the -nmw tree. Thanks, Steve. On 05/01/15 18:25, Bob Peterson wrote: > Hi, > > 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. > > Regards, > > Bob Peterson > Red Hat File Systems > > Signed-off-by: Bob Peterson <rpeterso@redhat.com> > --- > diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c > index a23524a..aeb7bc9 100644 > --- a/fs/gfs2/glock.c > +++ b/fs/gfs2/glock.c > @@ -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); > ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-09 16:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <652811562.3989950.1420482199546.JavaMail.zimbra@redhat.com>
2015-01-05 18:25 ` [Cluster-devel] [GFS2 PATCH] GFS2: Eliminate __gfs2_glock_remove_from_lru Bob Peterson
2015-01-09 16:49 ` Steven Whitehouse
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).