gfs2: Fix unlinked inode cleanup

[ Upstream commit 7c6f714d88475ceae5342264858a641eafa19632 ]

Before commit f0e56edc2ec7 ("gfs2: Split the two kinds of glock "delete"
work"), function delete_work_func() was used to trigger the eviction of
in-memory inodes from remote as well as deleting unlinked inodes at a
later point.  These two kinds of work were then split into two kinds of
work, and the two places in the code were deferred deletion of inodes is
required accidentally ended up queuing the wrong kind of work.  This
caused unlinked inodes to be left behind, which could in the worst case
fill up filesystems and require a filesystem check to recover.

Fix that by queuing the right kind of work in try_rgrp_unlink() and
gfs2_drop_inode().

Fixes: f0e56edc2ec7 ("gfs2: Split the two kinds of glock "delete" work")
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index b7f5347e4b41b519b85ef1c54274897ae68b9875..3af6120d55b51af049d64e66153a0b214f9f29bc 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1013,7 +1013,7 @@ bool gfs2_queue_try_to_evict(struct gfs2_glock *gl)
                                  &gl->gl_delete, 0);
 }
 
-static bool gfs2_queue_verify_delete(struct gfs2_glock *gl, bool later)
+bool gfs2_queue_verify_delete(struct gfs2_glock *gl, bool later)
 {
        struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
        unsigned long delay;

diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index adf0091cc98f9571533ffde410bf1a2d83763b30..63e101d448e961b0c3944b29054cdf4123bb1c40 100644 (file)
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -245,6 +245,7 @@ static inline int gfs2_glock_nq_init(struct gfs2_glock *gl,
 void gfs2_glock_cb(struct gfs2_glock *gl, unsigned int state);
 void gfs2_glock_complete(struct gfs2_glock *gl, int ret);
 bool gfs2_queue_try_to_evict(struct gfs2_glock *gl);
+bool gfs2_queue_verify_delete(struct gfs2_glock *gl, bool later);
 void gfs2_cancel_delete_work(struct gfs2_glock *gl);
 void gfs2_flush_delete_work(struct gfs2_sbd *sdp);
 void gfs2_gl_hash_clear(struct gfs2_sbd *sdp);

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 29c772816765266b420b24e9903424c96e3ed0ce..53930312971530014e383a886fd5ffa8a6580b5d 100644 (file)
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1879,7 +1879,7 @@ static void try_rgrp_unlink(struct gfs2_rgrpd *rgd, u64 *last_unlinked, u64 skip
                 */
                ip = gl->gl_object;
 
-               if (ip || !gfs2_queue_try_to_evict(gl))
+               if (ip || !gfs2_queue_verify_delete(gl, false))
                        gfs2_glock_put(gl);
                else
                        found++;

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 6678060ed4d2bba850beb8b876bd1c7d728717a2..e22c1edc32b39e767b9ebc3bbc1755969b7c3d02 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1045,7 +1045,7 @@ static int gfs2_drop_inode(struct inode *inode)
                struct gfs2_glock *gl = ip->i_iopen_gh.gh_gl;
 
                gfs2_glock_hold(gl);
-               if (!gfs2_queue_try_to_evict(gl))
+               if (!gfs2_queue_verify_delete(gl, true))
                        gfs2_glock_put_async(gl);
                return 0;
        }