]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
GFS2: Don't waste time locking lru_lock for non-lru glocks
authorBob Peterson <rpeterso@redhat.com>
Wed, 26 Jul 2017 15:57:35 +0000 (10:57 -0500)
committerBob Peterson <rpeterso@redhat.com>
Wed, 9 Aug 2017 14:36:39 +0000 (09:36 -0500)
Before this patch, glock_dq would call gfs2_glock_remove_from_lru.
For glocks that are never put on the LRU, such as the transaction
glock, this just takes the spin_lock, determines there's nothing to
be done because the list is empty, then unlocks again. This was
causing unnecessary lock contention on the lru_lock spin_lock.
This patch adds a check for GLOF_LRU in the glops before taking
the spin_lock.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
fs/gfs2/glock.c

index c38ab6c818983803d67815ac4a32b9302e48795d..1029340fc8ba46f1bba1a26a9bcbeb403e13b59e 100644 (file)
@@ -150,6 +150,9 @@ void gfs2_glock_add_to_lru(struct gfs2_glock *gl)
 
 static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)
 {
+       if (!(gl->gl_ops->go_flags & GLOF_LRU))
+               return;
+
        spin_lock(&lru_lock);
        if (!list_empty(&gl->gl_lru)) {
                list_del_init(&gl->gl_lru);