lkml.org 
[lkml]   [2024]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH v4 18/34] ext4: drop ext4_es_is_delonly()
    Date
    From: Zhang Yi <yi.zhang@huawei.com>

    Since we don't add delayed flag in unwritten extent status entry, 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>
    ---
    fs/ext4/extents_status.c | 18 +++++++++---------
    fs/ext4/extents_status.h | 5 -----
    fs/ext4/inode.c | 4 ++--
    3 files changed, 11 insertions(+), 16 deletions(-)

    diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
    index 9cac4ea57b73..062293e739cc 100644
    --- a/fs/ext4/extents_status.c
    +++ b/fs/ext4/extents_status.c
    @@ -561,8 +561,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;
    @@ -1137,7 +1137,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);
    @@ -1289,7 +1289,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_cluster--;
    left_delonly = true;
    break;
    @@ -1309,7 +1309,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_cluster--;
    right_delonly = true;
    break;
    @@ -2230,7 +2230,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);
    @@ -2242,7 +2242,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);
    @@ -2255,7 +2255,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);
    @@ -2267,7 +2267,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 5b49cb3b9aff..e484c60e55e3 100644
    --- a/fs/ext4/extents_status.h
    +++ b/fs/ext4/extents_status.h
    @@ -184,11 +184,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 64bdfa9e06b2..2704dca96ee7 100644
    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -1643,7 +1643,7 @@ static int ext4_da_check_clu_allocated(struct inode *inode, ext4_lblk_t lblk,
    int ret;

    *allocated = false;
    - if (ext4_es_scan_clu(inode, &ext4_es_is_delonly, lblk))
    + if (ext4_es_scan_clu(inode, &ext4_es_is_delayed, lblk))
    return 0;

    if (ext4_es_scan_clu(inode, &ext4_es_is_mapped, lblk))
    @@ -1760,7 +1760,7 @@ static int ext4_da_map_blocks(struct inode *inode, struct ext4_map_blocks *map)
    * 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;
    }
    --
    2.39.2

    \
     
     \ /
      Last update: 2024-05-27 16:33    [W:3.902 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site