gfs2: Rename gfs2_{withdrawing_or_ => }withdrawn

With delayed withdraws and the SDF_WITHDRAWING flag gone, we can now
rename gfs2_withdrawing_or_withdrawn() back to gfs2_withdrawn().

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

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 47d74afd63ac99e5db0ba548c103e2b2d968edff..a2ed80f81d73879c797fc49fd971b8cf99b2c0a2 100644 (file)
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -435,7 +435,7 @@ static int gfs2_read_folio(struct file *file, struct folio *folio)
                error = mpage_read_folio(folio, gfs2_block_map);
        }
 
-       if (gfs2_withdrawing_or_withdrawn(sdp))
+       if (gfs2_withdrawn(sdp))
                return -EIO;
 
        return error;

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index bc67fa058c845997588c3db660e9bcd4be3561bf..832e3c12ea275ad3c76b428835df11280b65c8c4 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1446,7 +1446,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
 
        if (!(fl->c.flc_flags & FL_POSIX))
                return -ENOLCK;
-       if (gfs2_withdrawing_or_withdrawn(sdp)) {
+       if (gfs2_withdrawn(sdp)) {
                if (lock_is_unlock(fl))
                        locks_lock_file_wait(file, fl);
                return -EIO;

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index c15dce8c987be0f93846134c54d5a3458f4e97a0..8ecd9c477f02e00a0a12b4379b12b2cd155df9f1 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -154,7 +154,7 @@ static bool glock_blocked_by_withdraw(struct gfs2_glock *gl)
 {
        struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
 
-       if (!gfs2_withdrawing_or_withdrawn(sdp))
+       if (!gfs2_withdrawn(sdp))
                return false;
        if (gl->gl_ops->go_flags & GLOF_NONDISK)
                return false;
@@ -270,7 +270,7 @@ static void __gfs2_glock_put(struct gfs2_glock *gl)
        GLOCK_BUG_ON(gl, !list_empty(&gl->gl_holders));
        if (mapping) {
                truncate_inode_pages_final(mapping);
-               if (!gfs2_withdrawing_or_withdrawn(sdp))
+               if (!gfs2_withdrawn(sdp))
                        GLOCK_BUG_ON(gl, !mapping_empty(mapping));
        }
        trace_gfs2_glock_put(gl);
@@ -755,7 +755,7 @@ skip_inval:
         * gfs2_gl_hash_clear calls clear_glock) and recovery is complete
         * then it's okay to tell dlm to unlock it.
         */
-       if (unlikely(sdp->sd_log_error) && !gfs2_withdrawing_or_withdrawn(sdp))
+       if (unlikely(sdp->sd_log_error) && !gfs2_withdrawn(sdp))
                gfs2_withdraw(sdp);
        if (glock_blocked_by_withdraw(gl) &&
            (target != LM_ST_UNLOCKED ||
@@ -803,7 +803,7 @@ skip_inval:
                         */
                } else {
                        fs_err(sdp, "lm_lock ret %d\n", ret);
-                       GLOCK_BUG_ON(gl, !gfs2_withdrawing_or_withdrawn(sdp));
+                       GLOCK_BUG_ON(gl, !gfs2_withdrawn(sdp));
                        return;
                }
        }

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 28b22cbfb507478eac921849545e3660f533a8e5..242e47926b39d7cdd0cdc9afd921040d97369963 100644 (file)
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -175,7 +175,7 @@ static int gfs2_rgrp_metasync(struct gfs2_glock *gl)
 
        filemap_fdatawrite_range(metamapping, start, end);
        error = filemap_fdatawait_range(metamapping, start, end);
-       WARN_ON_ONCE(error && !gfs2_withdrawing_or_withdrawn(sdp));
+       WARN_ON_ONCE(error && !gfs2_withdrawn(sdp));
        mapping_set_error(metamapping, error);
        if (error)
                gfs2_io_error(sdp);

diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
index c18e732a04bd199a43bbebf037c9b0f33820b7e1..301e17345f52d72a7018cd57cadac9a3c8693331 100644 (file)
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@ -1195,7 +1195,7 @@ static void gdlm_recover_prep(void *arg)
        struct gfs2_sbd *sdp = arg;
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
 
-       if (gfs2_withdrawing_or_withdrawn(sdp)) {
+       if (gfs2_withdrawn(sdp)) {
                fs_err(sdp, "recover_prep ignored due to withdraw.\n");
                return;
        }
@@ -1221,7 +1221,7 @@ static void gdlm_recover_slot(void *arg, struct dlm_slot *slot)
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
        int jid = slot->slot - 1;
 
-       if (gfs2_withdrawing_or_withdrawn(sdp)) {
+       if (gfs2_withdrawn(sdp)) {
                fs_err(sdp, "recover_slot jid %d ignored due to withdraw.\n",
                       jid);
                return;
@@ -1250,7 +1250,7 @@ static void gdlm_recover_done(void *arg, struct dlm_slot *slots, int num_slots,
        struct gfs2_sbd *sdp = arg;
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
 
-       if (gfs2_withdrawing_or_withdrawn(sdp)) {
+       if (gfs2_withdrawn(sdp)) {
                fs_err(sdp, "recover_done ignored due to withdraw.\n");
                return;
        }
@@ -1281,7 +1281,7 @@ static void gdlm_recovery_result(struct gfs2_sbd *sdp, unsigned int jid,
 {
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
 
-       if (gfs2_withdrawing_or_withdrawn(sdp)) {
+       if (gfs2_withdrawn(sdp)) {
                fs_err(sdp, "recovery_result jid %d ignored due to withdraw.\n",
                       jid);
                return;

diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 26a1baa21535032777ab3ab9426bf08c65f12056..b97da7f4d3f873829a5e0b77573234c576be1700 100644 (file)
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -118,7 +118,7 @@ __acquires(&sdp->sd_ail_lock)
                        }
                }
 
-               if (gfs2_withdrawing_or_withdrawn(sdp)) {
+               if (gfs2_withdrawn(sdp)) {
                        gfs2_remove_from_ail(bd);
                        continue;
                }
@@ -834,7 +834,7 @@ void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,
        struct super_block *sb = sdp->sd_vfs;
        u64 dblock;
 
-       if (gfs2_withdrawing_or_withdrawn(sdp))
+       if (gfs2_withdrawn(sdp))
                return;
 
        page = mempool_alloc(gfs2_page_pool, GFP_NOIO);
@@ -981,7 +981,7 @@ static void empty_ail1_list(struct gfs2_sbd *sdp)
                gfs2_ail1_wait(sdp);
                empty = gfs2_ail1_empty(sdp, 0);
 
-               if (gfs2_withdrawing_or_withdrawn(sdp))
+               if (gfs2_withdrawn(sdp))
                        break;
        }
 }
@@ -1044,7 +1044,7 @@ repeat:
         * Do this check while holding the log_flush_lock to prevent new
         * buffers from being added to the ail via gfs2_pin()
         */
-       if (gfs2_withdrawing_or_withdrawn(sdp) ||
+       if (gfs2_withdrawn(sdp) ||
            !test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags))
                goto out;
 
@@ -1094,14 +1094,14 @@ repeat:
                        goto out_withdraw;
 
        gfs2_ordered_write(sdp);
-       if (gfs2_withdrawing_or_withdrawn(sdp))
+       if (gfs2_withdrawn(sdp))
                goto out_withdraw;
        lops_before_commit(sdp, tr);
-       if (gfs2_withdrawing_or_withdrawn(sdp))
+       if (gfs2_withdrawn(sdp))
                goto out_withdraw;
        if (sdp->sd_jdesc)
                gfs2_log_submit_bio(&sdp->sd_jdesc->jd_log_bio, REQ_OP_WRITE);
-       if (gfs2_withdrawing_or_withdrawn(sdp))
+       if (gfs2_withdrawn(sdp))
                goto out_withdraw;
 
        if (sdp->sd_log_head != sdp->sd_log_flush_head) {
@@ -1109,7 +1109,7 @@ repeat:
        } else if (sdp->sd_log_tail != sdp->sd_log_flush_tail && !sdp->sd_log_idle) {
                log_write_header(sdp, flags);
        }
-       if (gfs2_withdrawing_or_withdrawn(sdp))
+       if (gfs2_withdrawn(sdp))
                goto out_withdraw;
        lops_after_commit(sdp, tr);
 
@@ -1127,7 +1127,7 @@ repeat:
        if (!(flags & GFS2_LOG_HEAD_FLUSH_NORMAL)) {
                if (!sdp->sd_log_idle) {
                        empty_ail1_list(sdp);
-                       if (gfs2_withdrawing_or_withdrawn(sdp))
+                       if (gfs2_withdrawn(sdp))
                                goto out_withdraw;
                        log_write_header(sdp, flags);
                }
@@ -1296,7 +1296,7 @@ int gfs2_logd(void *data)
 
        set_freezable();
        while (!kthread_should_stop()) {
-               if (gfs2_withdrawing_or_withdrawn(sdp))
+               if (gfs2_withdrawn(sdp))
                        break;
 
                /* Check for errors writing to the journal */
@@ -1333,7 +1333,7 @@ int gfs2_logd(void *data)
                                gfs2_ail_flush_reqd(sdp) ||
                                gfs2_jrnl_flush_reqd(sdp) ||
                                sdp->sd_log_error ||
-                               gfs2_withdrawing_or_withdrawn(sdp) ||
+                               gfs2_withdrawn(sdp) ||
                                kthread_should_stop(),
                                t);
        }

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 7fb11ff71b5a9d9213fbbbe2a43a6496218b7af8..3ee90a4452b9d0e723303afc50cc551889a16ba3 100644 (file)
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -263,7 +263,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,
        struct buffer_head *bh, *bhs[2];
        int num = 0;
 
-       if (gfs2_withdrawing_or_withdrawn(sdp) &&
+       if (gfs2_withdrawn(sdp) &&
            !gfs2_withdraw_in_prog(sdp)) {
                *bhp = NULL;
                return -EIO;
@@ -322,7 +322,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,
 
 int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh)
 {
-       if (gfs2_withdrawing_or_withdrawn(sdp) &&
+       if (gfs2_withdrawn(sdp) &&
            !gfs2_withdraw_in_prog(sdp))
                return -EIO;
 
@@ -334,7 +334,7 @@ int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh)
                        gfs2_io_error_bh_wd(sdp, bh);
                return -EIO;
        }
-       if (gfs2_withdrawing_or_withdrawn(sdp) &&
+       if (gfs2_withdrawn(sdp) &&
            !gfs2_withdraw_in_prog(sdp))
                return -EIO;
 

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index c42982bdd4b209980bb7817284a25789857f5df2..3138cc4658d3d644f529a1ea5f6523cc2f8d31cf 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1040,7 +1040,7 @@ hostdata_error:
 void gfs2_lm_unmount(struct gfs2_sbd *sdp)
 {
        const struct lm_lockops *lm = sdp->sd_lockstruct.ls_ops;
-       if (!gfs2_withdrawing_or_withdrawn(sdp) && lm->lm_unmount)
+       if (!gfs2_withdrawn(sdp) && lm->lm_unmount)
                lm->lm_unmount(sdp, true);
 }
 

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 7af232e55b0a11f8fe6ce41e764b22911500620a..b1692f12a602a685e1be91ac6383b3be914191ce 100644 (file)
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -125,7 +125,7 @@ static void gfs2_qd_dispose(struct gfs2_quota_data *qd)
        hlist_bl_del_rcu(&qd->qd_hlist);
        spin_unlock_bucket(qd->qd_hash);
 
-       if (!gfs2_withdrawing_or_withdrawn(sdp)) {
+       if (!gfs2_withdrawn(sdp)) {
                gfs2_assert_warn(sdp, !qd->qd_change);
                gfs2_assert_warn(sdp, !qd->qd_slot_ref);
                gfs2_assert_warn(sdp, !qd->qd_bh_count);
@@ -1551,7 +1551,7 @@ static void quotad_error(struct gfs2_sbd *sdp, const char *msg, int error)
 {
        if (error == 0 || error == -EROFS)
                return;
-       if (!gfs2_withdrawing_or_withdrawn(sdp)) {
+       if (!gfs2_withdrawn(sdp)) {
                if (!cmpxchg(&sdp->sd_log_error, 0, error))
                        fs_err(sdp, "gfs2_quotad: %s error %d\n", msg, error);
                wake_up(&sdp->sd_logd_waitq);
@@ -1583,7 +1583,7 @@ int gfs2_quotad(void *data)
        while (!kthread_should_stop()) {
                unsigned long t;
 
-               if (gfs2_withdrawing_or_withdrawn(sdp))
+               if (gfs2_withdrawn(sdp))
                        break;
 
                now = jiffies;
@@ -1614,7 +1614,7 @@ int gfs2_quotad(void *data)
                t = min(statfs_deadline - now, quotad_deadline - now);
                wait_event_freezable_timeout(sdp->sd_quota_wait,
                                sdp->sd_statfs_force_sync ||
-                               gfs2_withdrawing_or_withdrawn(sdp) ||
+                               gfs2_withdrawn(sdp) ||
                                kthread_should_stop(),
                                t);
 

diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index 24250478b085d8f6aa2994c7af2ed62244146e1a..4873b1c0e1bdf7f237c627ed29caa22fc9382023 100644 (file)
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -408,7 +408,7 @@ void gfs2_recover_func(struct work_struct *work)
        int error = 0;
        int jlocked = 0;
 
-       if (gfs2_withdrawing_or_withdrawn(sdp)) {
+       if (gfs2_withdrawn(sdp)) {
                fs_err(sdp, "jid=%u: Recovery not attempted due to withdraw.\n",
                       jd->jd_jid);
                goto fail;

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index ea9084e871a8f2014f7dce838bbd5bec795c2f8c..a384b1713409faf77146997b6138f84bdf5884d4 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -137,7 +137,7 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp)
        int error;
 
        j_gl->gl_ops->go_inval(j_gl, DIO_METADATA);
-       if (gfs2_withdrawing_or_withdrawn(sdp))
+       if (gfs2_withdrawn(sdp))
                return -EIO;
 
        if (sdp->sd_log_sequence == 0) {
@@ -147,7 +147,7 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp)
        }
 
        error = gfs2_quota_init(sdp);
-       if (!error && gfs2_withdrawing_or_withdrawn(sdp))
+       if (!error && gfs2_withdrawn(sdp))
                error = -EIO;
        if (!error)
                set_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags);
@@ -491,7 +491,7 @@ static void gfs2_dirty_inode(struct inode *inode, int flags)
        if (unlikely(!ip->i_gl))
                return;
 
-       if (gfs2_withdrawing_or_withdrawn(sdp))
+       if (gfs2_withdrawn(sdp))
                return;
        if (!gfs2_glock_is_locked_by_me(ip->i_gl)) {
                ret = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
@@ -597,7 +597,7 @@ restart:
        if (!sb_rdonly(sb))
                gfs2_make_fs_ro(sdp);
        else {
-               if (gfs2_withdrawing_or_withdrawn(sdp))
+               if (gfs2_withdrawn(sdp))
                        gfs2_destroy_threads(sdp);
 
                gfs2_quota_cleanup(sdp);
@@ -776,7 +776,7 @@ static int gfs2_freeze_fs(struct super_block *sb)
        if (test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags)) {
                gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_FREEZE |
                               GFS2_LFC_FREEZE_GO_SYNC);
-               if (gfs2_withdrawing_or_withdrawn(sdp))
+               if (gfs2_withdrawn(sdp))
                        return -EIO;
        }
        return 0;

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 8093a596661ecace60f9bee1ac8cb8fff0e5d98e..5439a65549af7fa6e23287bb86b91c3a8131d7ca 100644 (file)
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -191,7 +191,7 @@ static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
 
 static ssize_t withdraw_show(struct gfs2_sbd *sdp, char *buf)
 {
-       unsigned int b = gfs2_withdrawing_or_withdrawn(sdp);
+       unsigned int b = gfs2_withdrawn(sdp);
        return sysfs_emit(buf, "%u\n", b);
 }
 

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 075f7e9abe47ca8a48d59f99cd0fd0cff2f7e1a5..f0cfdb5c5f2d0780458563109d8e061e09b48ff9 100644 (file)
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -289,7 +289,7 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
                       (unsigned long long)bd->bd_bh->b_blocknr);
                BUG();
        }
-       if (gfs2_withdrawing_or_withdrawn(sdp)) {
+       if (gfs2_withdrawn(sdp)) {
                fs_info(sdp, "GFS2:adding buf while withdrawn! 0x%llx\n",
                        (unsigned long long)bd->bd_bh->b_blocknr);
                goto out_unlock;

diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index e15e11f6f16166e6bbef852ed82b007273c00ca5..4c3b44eafc9f789550c824642466da05c8fab447 100644 (file)
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -366,7 +366,7 @@ void gfs2_withdraw(struct gfs2_sbd *sdp)
 void gfs2_assert_withdraw_i(struct gfs2_sbd *sdp, char *assertion,
                            const char *function, char *file, unsigned int line)
 {
-       if (gfs2_withdrawing_or_withdrawn(sdp))
+       if (gfs2_withdrawn(sdp))
                return;
 
        fs_err(sdp,
@@ -524,7 +524,7 @@ void gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh,
                        const char *function, char *file, unsigned int line,
                        bool withdraw)
 {
-       if (gfs2_withdrawing_or_withdrawn(sdp))
+       if (gfs2_withdrawn(sdp))
                return;
 
        fs_err(sdp, "fatal: I/O error - "

diff --git a/fs/gfs2/util.h b/fs/gfs2/util.h
index 51347a467b89737d6ed738d1a47061d80c8a2656..832c6c6eef4144311695416938e408608d410c96 100644 (file)
--- a/fs/gfs2/util.h
+++ b/fs/gfs2/util.h
@@ -183,11 +183,10 @@ static inline unsigned int gfs2_tune_get_i(struct gfs2_tune *gt,
 }
 
 /**
- * gfs2_withdrawing_or_withdrawn - test whether the file system is withdrawing
- *                                 or withdrawn
+ * gfs2_withdrawn - test whether the file system is withdrawn
  * @sdp: the superblock
  */
-static inline bool gfs2_withdrawing_or_withdrawn(struct gfs2_sbd *sdp)
+static inline bool gfs2_withdrawn(struct gfs2_sbd *sdp)
 {
        return unlikely(test_bit(SDF_WITHDRAWN, &sdp->sd_flags));
 }