From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Tue, 19 Nov 2024 09:44:56 +0000 (+0100)
Subject: gfs2: Only defer deletes when we have an iopen glock
X-Git-Tag: v6.13-rc1~79^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5b7a2400edc458b22133d5e5394bea26eab1923;p=thirdparty%2Fkernel%2Flinux.git

gfs2: Only defer deletes when we have an iopen glock

The mechanism to defer deleting unlinked inodes is tied to
delete_work_func(), which is tied to iopen glocks.  When we don't have
an iopen glock, we must carry out deletes immediately instead.

Fixes a NULL pointer dereference in gfs2_evict_inode().

Fixes: 8c21c2c71e66 ("gfs2: Call gfs2_queue_verify_delete from gfs2_evict_inode")
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index aadb83e38c17b..92a3b6ddafdc1 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1503,10 +1503,13 @@ static void gfs2_evict_inode(struct inode *inode)
 	    !test_bit(SDF_KILL, &sdp->sd_flags)) {
 		struct gfs2_glock *io_gl = ip->i_iopen_gh.gh_gl;
 
-		gfs2_glock_hold(io_gl);
-		if (!gfs2_queue_verify_delete(io_gl, true))
-			gfs2_glock_put(io_gl);
-		goto out;
+		if (io_gl) {
+			gfs2_glock_hold(io_gl);
+			if (!gfs2_queue_verify_delete(io_gl, true))
+				gfs2_glock_put(io_gl);
+			goto out;
+		}
+		behavior = EVICT_SHOULD_DELETE;
 	}
 	if (behavior == EVICT_SHOULD_DELETE)
 		ret = evict_unlinked_inode(inode);