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>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index e242745cf40fa418c2cea1b19583f8ec29bb004c..9cbf8d98489a4a67b05c8e2cfae16d34aeb594d9 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -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 {

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 54319328b16b5b39cfb7f18f063c78ca698264a5..7d6cca467fa19b89afd7d736c3797b6c854f79b2 100644 (file)
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -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 &&

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 7abb43bb8df0c6c6b047e1a6ea1dca16221b2efb..ab857431dfa4955f7e738df204c24db434f10be3 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -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,
 };

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 19d19491c0d12473b18598c93083c33f7ab1bd7f..6ea295cee4630750f5691dd15f82f16c97f77ff9 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -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);
 

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 9f4d5d6549ee601e31e6203e19b7536afdc9b5b4..e0dceef3c9cc69f2eb4ed4fa8fa354f68265615c 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -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)

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 2dfbe2f188dd08ea433f437c60880fb332da3984..a85fe7b929115ceb77834ed5260e5fb681ef88e3 100644 (file)
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -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_REMOTE_WITHDRAW, &f),
                     test_bit(SDF_WITHDRAW_RECOVERY, &f),
-                    test_bit(SDF_DEACTIVATING, &f),
+                    test_bit(SDF_KILL, &f),
                     sdp->sd_log_error,
                     rwsem_is_locked(&sdp->sd_log_flush_lock),
                     sdp->sd_log_num_revoke,