ext4: drop ext4_es_is_delonly()

Since we don't add delayed flag in unwritten extents, so there is no
difference between ext4_es_is_delayed() and ext4_es_is_delonly(),
just drop ext4_es_is_delonly().

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20240813123452.2824659-12-yi.zhang@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
index b372b98af36652a82d92e592d494657beabc2d7d..68c47ecc01a5af59c5df15c1c49567bcfb34c347 100644 (file)
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@ -558,8 +558,8 @@ static int ext4_es_can_be_merged(struct extent_status *es1,
        if (ext4_es_is_hole(es1))
                return 1;
 
-       /* we need to check delayed extent is without unwritten status */
-       if (ext4_es_is_delayed(es1) && !ext4_es_is_unwritten(es1))
+       /* we need to check delayed extent */
+       if (ext4_es_is_delayed(es1))
                return 1;
 
        return 0;
@@ -1135,7 +1135,7 @@ static void count_rsvd(struct inode *inode, ext4_lblk_t lblk, long len,
        struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
        ext4_lblk_t i, end, nclu;
 
-       if (!ext4_es_is_delonly(es))
+       if (!ext4_es_is_delayed(es))
                return;
 
        WARN_ON(len <= 0);
@@ -1285,7 +1285,7 @@ static unsigned int get_rsvd(struct inode *inode, ext4_lblk_t end,
                es = rc->left_es;
                while (es && ext4_es_end(es) >=
                       EXT4_LBLK_CMASK(sbi, rc->first_do_lblk)) {
-                       if (ext4_es_is_delonly(es)) {
+                       if (ext4_es_is_delayed(es)) {
                                rc->ndelonly--;
                                left_delonly = true;
                                break;
@@ -1305,7 +1305,7 @@ static unsigned int get_rsvd(struct inode *inode, ext4_lblk_t end,
                        }
                        while (es && es->es_lblk <=
                               EXT4_LBLK_CFILL(sbi, rc->last_do_lblk)) {
-                               if (ext4_es_is_delonly(es)) {
+                               if (ext4_es_is_delayed(es)) {
                                        rc->ndelonly--;
                                        right_delonly = true;
                                        break;
@@ -2226,7 +2226,7 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
        if (EXT4_B2C(sbi, lblk) == EXT4_B2C(sbi, end)) {
                first = EXT4_LBLK_CMASK(sbi, lblk);
                if (first != lblk)
-                       f_del = __es_scan_range(inode, &ext4_es_is_delonly,
+                       f_del = __es_scan_range(inode, &ext4_es_is_delayed,
                                                first, lblk - 1);
                if (f_del) {
                        ret = __insert_pending(inode, first, prealloc);
@@ -2238,7 +2238,7 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
                               sbi->s_cluster_ratio - 1;
                        if (last != end)
                                l_del = __es_scan_range(inode,
-                                                       &ext4_es_is_delonly,
+                                                       &ext4_es_is_delayed,
                                                        end + 1, last);
                        if (l_del) {
                                ret = __insert_pending(inode, last, prealloc);
@@ -2251,7 +2251,7 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
        } else {
                first = EXT4_LBLK_CMASK(sbi, lblk);
                if (first != lblk)
-                       f_del = __es_scan_range(inode, &ext4_es_is_delonly,
+                       f_del = __es_scan_range(inode, &ext4_es_is_delayed,
                                                first, lblk - 1);
                if (f_del) {
                        ret = __insert_pending(inode, first, prealloc);
@@ -2263,7 +2263,7 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
 
                last = EXT4_LBLK_CMASK(sbi, end) + sbi->s_cluster_ratio - 1;
                if (last != end)
-                       l_del = __es_scan_range(inode, &ext4_es_is_delonly,
+                       l_del = __es_scan_range(inode, &ext4_es_is_delayed,
                                                end + 1, last);
                if (l_del) {
                        ret = __insert_pending(inode, last, prealloc);

diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h
index 7d7af642f7b26d015ea3d4f3725e157f955a834e..4424232de2989dd5d51a0eed99af780666d2452e 100644 (file)
--- a/fs/ext4/extents_status.h
+++ b/fs/ext4/extents_status.h
@@ -190,11 +190,6 @@ static inline int ext4_es_is_mapped(struct extent_status *es)
        return (ext4_es_is_written(es) || ext4_es_is_unwritten(es));
 }
 
-static inline int ext4_es_is_delonly(struct extent_status *es)
-{
-       return (ext4_es_is_delayed(es) && !ext4_es_is_unwritten(es));
-}
-
 static inline void ext4_es_set_referenced(struct extent_status *es)
 {
        es->es_pblk |= ((ext4_fsblk_t)EXTENT_STATUS_REFERENCED) << ES_SHIFT;

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 1fa59b0fc7f317b53e92b5e35ae3a4db71e6d378..a6f1286e824d8bdf0730c26b15a878e9c4b38984 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1645,7 +1645,7 @@ static int ext4_clu_alloc_state(struct inode *inode, ext4_lblk_t lblk)
        int ret;
 
        /* Has delalloc reservation? */
-       if (ext4_es_scan_clu(inode, &ext4_es_is_delonly, lblk))
+       if (ext4_es_scan_clu(inode, &ext4_es_is_delayed, lblk))
                return 1;
 
        /* Already been allocated? */
@@ -1766,7 +1766,7 @@ found:
                 * Delayed extent could be allocated by fallocate.
                 * So we need to check it.
                 */
-               if (ext4_es_is_delonly(&es)) {
+               if (ext4_es_is_delayed(&es)) {
                        map->m_flags |= EXT4_MAP_DELAYED;
                        return 0;
                }