summaryrefslogtreecommitdiff
path: root/fs/gfs2/super.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruenba@redhat.com>2022-12-04 15:27:11 +0300
committerAndreas Gruenbacher <agruenba@redhat.com>2022-12-06 18:06:32 +0300
commitfe1bff6517de789d491844f53e61e4ff02e8f8b1 (patch)
tree1e8230a98ccae06471ebc04da7702ad73cc6ca7a /fs/gfs2/super.c
parent764665c6775251d4569ba9f09981459bbb166359 (diff)
downloadlinux-fe1bff6517de789d491844f53e61e4ff02e8f8b1.tar.xz
gfs2: Simply dequeue iopen glock in gfs2_evict_inode
With the previous change, to simplify things, we can always just dequeue and uninitialize the iopen glock in gfs2_evict_inode() even if it isn't queued anymore. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r--fs/gfs2/super.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 02f1b5f2d7f2..999cc146d708 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1419,12 +1419,9 @@ out:
struct gfs2_glock *gl = ip->i_iopen_gh.gh_gl;
glock_clear_object(gl, ip);
- if (test_bit(HIF_HOLDER, &ip->i_iopen_gh.gh_iflags)) {
- ip->i_iopen_gh.gh_flags |= GL_NOCACHE;
- gfs2_glock_dq(&ip->i_iopen_gh);
- }
gfs2_glock_hold(gl);
- gfs2_holder_uninit(&ip->i_iopen_gh);
+ ip->i_iopen_gh.gh_flags |= GL_NOCACHE;
+ gfs2_glock_dq_uninit(&ip->i_iopen_gh);
gfs2_glock_put_eventually(gl);
}
if (ip->i_gl) {