Commit e7beb8b6 authored Aug 23, 2023 by Andreas Gruenbacher

gfs2: Rename SDF_DEACTIVATING to SDF_KILL



Rename the SDF_DEACTIVATING flag to SDF_KILL to make it more obvious
that this relates to the kill_sb filesystem operation.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

parent 3c69c437

fs/gfs2/glock.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1022,7 +1022,7 @@ static void delete_work_func(struct work_struct *work)
		* step entirely.
		*/
		if (gfs2_try_evict(gl)) {
		if (test_bit(SDF_DEACTIVATING, &sdp->sd_flags))
		if (test_bit(SDF_KILL, &sdp->sd_flags))
		goto out;
		if (gfs2_queue_verify_evict(gl))
		return;
		@@ -1035,7 +1035,7 @@ static void delete_work_func(struct work_struct *work)
		GFS2_BLKST_UNLINKED);
		if (IS_ERR(inode)) {
		if (PTR_ERR(inode) == -EAGAIN &&
		!test_bit(SDF_DEACTIVATING, &sdp->sd_flags) &&
		!test_bit(SDF_KILL, &sdp->sd_flags) &&
		gfs2_queue_verify_evict(gl))
		return;
		} else {

fs/gfs2/glops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -637,7 +637,7 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
		struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;

		if (!remote \|\| sb_rdonly(sdp->sd_vfs) \|\|
		test_bit(SDF_DEACTIVATING, &sdp->sd_flags))
		test_bit(SDF_KILL, &sdp->sd_flags))
		return;

		if (gl->gl_demote_state == LM_ST_UNLOCKED &&

fs/gfs2/incore.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -606,7 +606,7 @@ enum {
		SDF_REMOTE_WITHDRAW = 13, /* Performing remote recovery */
		SDF_WITHDRAW_RECOVERY = 14, /* Wait for journal recovery when we are
		withdrawing */
		SDF_DEACTIVATING = 15,
		SDF_KILL = 15,
		SDF_EVICTING = 16,
		SDF_FROZEN = 17,
		};

fs/gfs2/ops_fstype.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1786,9 +1786,9 @@ static void gfs2_kill_sb(struct super_block *sb)
		/*
		* Flush and then drain the delete workqueue here (via
		* destroy_workqueue()) to ensure that any delete work that
		* may be running will also see the SDF_DEACTIVATING flag.
		* may be running will also see the SDF_KILL flag.
		*/
		set_bit(SDF_DEACTIVATING, &sdp->sd_flags);
		set_bit(SDF_KILL, &sdp->sd_flags);
		gfs2_flush_delete_work(sdp);
		destroy_workqueue(sdp->sd_delete_wq);

fs/gfs2/super.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -546,7 +546,7 @@ void gfs2_make_fs_ro(struct gfs2_sbd *sdp)
		{
		int log_write_allowed = test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags);

		if (!test_bit(SDF_DEACTIVATING, &sdp->sd_flags))
		if (!test_bit(SDF_KILL, &sdp->sd_flags))
		gfs2_flush_delete_work(sdp);

		if (!log_write_allowed && current == sdp->sd_quotad_process)