gfs2: Mark withdraws as unlikely

Mark the gfs2_withdrawn(), gfs2_withdrawing(), and
gfs2_withdraw_in_prog() inline functions as likely to return %false.
This allows to get rid of likely() and unlikely() annotations at the
call sites of those functions.

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

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 9611bfceda4b6f8465a0b15cb640aa2696fbe8fd..4482a5a9bdc909a72bdb556c6090214dbd077ae8 100644 (file)
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -462,7 +462,7 @@ static int gfs2_read_folio(struct file *file, struct folio *folio)
                error = mpage_read_folio(folio, gfs2_block_map);
        }
 
-       if (unlikely(gfs2_withdrawn(sdp)))
+       if (gfs2_withdrawn(sdp))
                return -EIO;
 
        return error;

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 4b66efc1a82aa1c1a58fe04733f81f02d69dbe44..03902e780935289cfe3e059c17f1f5027c5b1261 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1442,7 +1442,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
 
        if (!(fl->fl_flags & FL_POSIX))
                return -ENOLCK;
-       if (unlikely(gfs2_withdrawn(sdp))) {
+       if (gfs2_withdrawn(sdp)) {
                if (fl->fl_type == F_UNLCK)
                        locks_lock_file_wait(file, fl);
                return -EIO;

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 2cb65f76eec88a040242d06394eb78e67dd077bf..b71dd7c8f65ecfe08573b9e2413afd37aee3a21a 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -156,7 +156,7 @@ static bool glock_blocked_by_withdraw(struct gfs2_glock *gl)
 {
        struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
 
-       if (likely(!gfs2_withdrawn(sdp)))
+       if (!gfs2_withdrawn(sdp))
                return false;
        if (gl->gl_ops->go_flags & GLOF_NONDISK)
                return false;
@@ -774,7 +774,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_withdrawn(sdp)))
+       if (unlikely(sdp->sd_log_error) && !gfs2_withdrawn(sdp))
                gfs2_withdraw_delayed(sdp);
        if (glock_blocked_by_withdraw(gl) &&
            (target != LM_ST_UNLOCKED ||

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 25ceb0805df254329b438f6af558e7be8b2f4eeb..299ae67ae85ef3073b55ca8c881888453af21e11 100644 (file)
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -252,7 +252,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,
        struct buffer_head *bh, *bhs[2];
        int num = 0;
 
-       if (unlikely(gfs2_withdrawn(sdp)) && !gfs2_withdraw_in_prog(sdp)) {
+       if (gfs2_withdrawn(sdp) && !gfs2_withdraw_in_prog(sdp)) {
                *bhp = NULL;
                return -EIO;
        }
@@ -310,7 +310,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 (unlikely(gfs2_withdrawn(sdp)) && !gfs2_withdraw_in_prog(sdp))
+       if (gfs2_withdrawn(sdp) && !gfs2_withdraw_in_prog(sdp))
                return -EIO;
 
        wait_on_buffer(bh);
@@ -321,7 +321,7 @@ int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh)
                        gfs2_io_error_bh_wd(sdp, bh);
                return -EIO;
        }
-       if (unlikely(gfs2_withdrawn(sdp)) && !gfs2_withdraw_in_prog(sdp))
+       if (gfs2_withdrawn(sdp) && !gfs2_withdraw_in_prog(sdp))
                return -EIO;
 
        return 0;

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

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index b5c75c8a8d627feb5c6208ddfb782f8c685d349c..85c77dd327ec43282dfa4461021fb8b5f20f3242 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -499,7 +499,7 @@ static void gfs2_dirty_inode(struct inode *inode, int flags)
                return;
        }
 
-       if (unlikely(gfs2_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);

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 7e835be7032d0bc751929ddaec8fc7a739168a16..1487fbb62d842a208792be7efd2450e48556e94c 100644 (file)
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -268,7 +268,7 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
                       (unsigned long long)bd->bd_bh->b_blocknr);
                BUG();
        }
-       if (unlikely(gfs2_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.h b/fs/gfs2/util.h
index 11c9d59b6889622912995be96bbe21b88e83bdea..76acf0b3981496b5e9f15763e41fd13df7feb9b4 100644 (file)
--- a/fs/gfs2/util.h
+++ b/fs/gfs2/util.h
@@ -203,8 +203,8 @@ static inline void gfs2_withdraw_delayed(struct gfs2_sbd *sdp)
  */
 static inline bool gfs2_withdrawn(struct gfs2_sbd *sdp)
 {
-       return test_bit(SDF_WITHDRAWN, &sdp->sd_flags) ||
-               test_bit(SDF_WITHDRAWING, &sdp->sd_flags);
+       return unlikely(test_bit(SDF_WITHDRAWN, &sdp->sd_flags) ||
+                       test_bit(SDF_WITHDRAWING, &sdp->sd_flags));
 }
 
 /**
@@ -213,13 +213,13 @@ static inline bool gfs2_withdrawn(struct gfs2_sbd *sdp)
  */
 static inline bool gfs2_withdrawing(struct gfs2_sbd *sdp)
 {
-       return test_bit(SDF_WITHDRAWING, &sdp->sd_flags) &&
-              !test_bit(SDF_WITHDRAWN, &sdp->sd_flags);
+       return unlikely(test_bit(SDF_WITHDRAWING, &sdp->sd_flags) &&
+                       !test_bit(SDF_WITHDRAWN, &sdp->sd_flags));
 }
 
 static inline bool gfs2_withdraw_in_prog(struct gfs2_sbd *sdp)
 {
-       return test_bit(SDF_WITHDRAW_IN_PROG, &sdp->sd_flags);
+       return unlikely(test_bit(SDF_WITHDRAW_IN_PROG, &sdp->sd_flags));
 }
 
 #define gfs2_tune_get(sdp, field) \