diff options
| author |   Bob Peterson <rpeterso@redhat.com> | 2021-08-02 09:08:51 -0500 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2021-08-20 09:03:46 -0500 |
| commit | 08d736667185dca2751cf47eabb0830cecdeb160 (patch) | |
| tree | b71b66b7535da70a729c1ca16ebe7117bbb379bb /fs/gfs2 | |
| parent | gfs2: Delay withdraw from atomic context (diff) | |
| download | linux-dev-08d736667185dca2751cf47eabb0830cecdeb160.tar.xz linux-dev-08d736667185dca2751cf47eabb0830cecdeb160.zip | |
gfs2: Remove redundant check from gfs2_glock_dq
In function gfs2_glock_dq, it checks to see if this is the fast path.
Before this patch, it checked both "find_first_holder(gl) == NULL" and
list_empty(&gl->gl_holders), which is redundant. If gl_holders is empty
then find_first_holder must return NULL. This patch removes the
redundancy.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/glock.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index ff8d6a79fc6e..e0eaa9cf9fb6 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -1494,12 +1494,11 @@ void gfs2_glock_dq(struct gfs2_holder *gh) list_del_init(&gh->gh_list); clear_bit(HIF_HOLDER, &gh->gh_iflags); - if (find_first_holder(gl) == NULL) { - if (list_empty(&gl->gl_holders) && - !test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) && - !test_bit(GLF_DEMOTE, &gl->gl_flags)) - fast_path = 1; - } + if (list_empty(&gl->gl_holders) && + !test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) && + !test_bit(GLF_DEMOTE, &gl->gl_flags)) + fast_path = 1; + if (!test_bit(GLF_LFLUSH, &gl->gl_flags) && demote_ok(gl)) gfs2_glock_add_to_lru(gl); |