From: Andreas Gruenbacher <agruenba@xxxxxxxxxx>
commit bbacb395ac5c57290cdfd02389788cbce64c237e upstream.
Before commit b77b4a4815a9 ("gfs2: Rework freeze / thaw logic"), the
freeze glock was kept around in the glock cache in shared mode without
being actively held while a filesystem is in thawed state. In that
state, memory pressure could have eventually evicted the freeze glock,
and the freeze_go_demote_ok callback was needed to prevent that from
happening.
With the freeze / thaw rework, the freeze glock is now always actively
held in shared mode while a filesystem is thawed, and the
freeze_go_demote_ok hack is no longer needed.
Signed-off-by: Andreas Gruenbacher <agruenba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/gfs2/glops.c | 13 -------------
1 file changed, 13 deletions(-)
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -613,18 +613,6 @@ static int freeze_go_xmote_bh(struct gfs
}
/**
- * freeze_go_demote_ok
- * @gl: the glock
- *
- * Always returns 0
- */
-
-static int freeze_go_demote_ok(const struct gfs2_glock *gl)
-{
- return 0;
-}
-
-/**
* iopen_go_callback - schedule the dcache entry for the inode to be deleted
* @gl: the glock
* @remote: true if this came from a different cluster node
@@ -748,7 +736,6 @@ const struct gfs2_glock_operations gfs2_
const struct gfs2_glock_operations gfs2_freeze_glops = {
.go_xmote_bh = freeze_go_xmote_bh,
- .go_demote_ok = freeze_go_demote_ok,
.go_callback = freeze_go_callback,
.go_type = LM_TYPE_NONDISK,
.go_flags = GLOF_NONDISK,
Patches currently in stable-queue which might be from agruenba@xxxxxxxxxx are
queue-6.1/pid-replace-struct-pid-1-element-array-with-flex-arr.patch
queue-6.1/gfs2-remove-freeze_go_demote_ok.patch
queue-6.1/gfs2-rename-sdf_-fs_frozen-freeze_initiator.patch
queue-6.1/gfs2-setattr_chown-add-missing-initialization.patch
queue-6.1/gfs2-remove-lm_flag_priority-flag.patch
queue-6.1/gfs2-rename-gfs2_freeze_lock-_shared.patch
queue-6.1/gfs2-rework-freeze-thaw-logic.patch
queue-6.1/gfs2-stop-using-gfs2_make_fs_ro-for-withdraw.patch
queue-6.1/gfs2-don-t-withdraw-if-init_threads-got-interrupted.patch
queue-6.1/gfs2-refcounting-fix-in-gfs2_thaw_super.patch
queue-6.1/gfs2-rename-remaining-transaction-glock-references.patch
queue-6.1/gfs2-fix-another-freeze-thaw-hang.patch
queue-6.1/gfs2-rename-the-freeze-thaw-_super-callbacks.patch
