niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

gfs2: Rename SDF_DEACTIVATING to SDF_KILL

Browse source 
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>
This commit is contained in:
Andreas Gruenbacher 2023-08-23 15:53:13 +02:00
parent 3c69c437bf
commit e7beb8b6de
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/gfs2/glock.c
View file

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

2
fs/gfs2/glops.c
View file

@ -637,7 +637,7 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
if (!remote || sb_rdonly(sdp->sd_vfs) || if (!remote || sb_rdonly(sdp->sd_vfs) ||
test_bit(SDF_DEACTIVATING, &sdp->sd_flags)) test_bit(SDF_KILL, &sdp->sd_flags))
return; return;
if (gl->gl_demote_state == LM_ST_UNLOCKED && if (gl->gl_demote_state == LM_ST_UNLOCKED &&

2
fs/gfs2/incore.h
View file

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

4
fs/gfs2/ops_fstype.c
View file

@ -1786,9 +1786,9 @@ static void gfs2_kill_sb(struct super_block *sb)
/* /*
* Flush and then drain the delete workqueue here (via * Flush and then drain the delete workqueue here (via
* destroy_workqueue()) to ensure that any delete work that * 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); gfs2_flush_delete_work(sdp);
destroy_workqueue(sdp->sd_delete_wq); destroy_workqueue(sdp->sd_delete_wq);

2
fs/gfs2/super.c
View file

@ -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); 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); gfs2_flush_delete_work(sdp);
if (!log_write_allowed && current == sdp->sd_quotad_process) if (!log_write_allowed && current == sdp->sd_quotad_process)

2
fs/gfs2/sys.c
View file

@ -118,7 +118,7 @@ static ssize_t status_show(struct gfs2_sbd *sdp, char *buf)
test_bit(SDF_WITHDRAW_IN_PROG, &f), test_bit(SDF_WITHDRAW_IN_PROG, &f),
test_bit(SDF_REMOTE_WITHDRAW, &f), test_bit(SDF_REMOTE_WITHDRAW, &f),
test_bit(SDF_WITHDRAW_RECOVERY, &f), test_bit(SDF_WITHDRAW_RECOVERY, &f),
test_bit(SDF_DEACTIVATING, &f), test_bit(SDF_KILL, &f),
sdp->sd_log_error, sdp->sd_log_error,
rwsem_is_locked(&sdp->sd_log_flush_lock), rwsem_is_locked(&sdp->sd_log_flush_lock),
sdp->sd_log_num_revoke, sdp->sd_log_num_revoke,