lkml.org 
[lkml]   [2022]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] fs/ntfs3: Rename bitmap_size() as ntfs3_bitmap_size()
    Date
    In order to introduce a bitmap_size() function in the bitmap API, we have
    to rename functions with a similar name.

    Add a "ntfs3_" prefix and change bitmap_size() into ntfs3_bitmap_size().

    No functional change.

    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    ---
    fs/ntfs3/bitmap.c | 4 ++--
    fs/ntfs3/fsntfs.c | 2 +-
    fs/ntfs3/index.c | 6 +++---
    fs/ntfs3/ntfs_fs.h | 2 +-
    fs/ntfs3/super.c | 2 +-
    5 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/fs/ntfs3/bitmap.c b/fs/ntfs3/bitmap.c
    index e3b5680fd516..f98327453d83 100644
    --- a/fs/ntfs3/bitmap.c
    +++ b/fs/ntfs3/bitmap.c
    @@ -661,7 +661,7 @@ int wnd_init(struct wnd_bitmap *wnd, struct super_block *sb, size_t nbits)
    wnd->total_zeroes = nbits;
    wnd->extent_max = MINUS_ONE_T;
    wnd->zone_bit = wnd->zone_end = 0;
    - wnd->nwnd = bytes_to_block(sb, bitmap_size(nbits));
    + wnd->nwnd = bytes_to_block(sb, ntfs3_bitmap_size(nbits));
    wnd->bits_last = nbits & (wbits - 1);
    if (!wnd->bits_last)
    wnd->bits_last = wbits;
    @@ -1323,7 +1323,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)
    return -EINVAL;

    /* Align to 8 byte boundary. */
    - new_wnd = bytes_to_block(sb, bitmap_size(new_bits));
    + new_wnd = bytes_to_block(sb, ntfs3_bitmap_size(new_bits));
    new_last = new_bits & (wbits - 1);
    if (!new_last)
    new_last = wbits;
    diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c
    index 3de5700a9b83..9c74d88ce0f0 100644
    --- a/fs/ntfs3/fsntfs.c
    +++ b/fs/ntfs3/fsntfs.c
    @@ -493,7 +493,7 @@ static int ntfs_extend_mft(struct ntfs_sb_info *sbi)
    ni->mi.dirty = true;

    /* Step 2: Resize $MFT::BITMAP. */
    - new_bitmap_bytes = bitmap_size(new_mft_total);
    + new_bitmap_bytes = ntfs3_bitmap_size(new_mft_total);

    err = attr_set_size(ni, ATTR_BITMAP, NULL, 0, &sbi->mft.bitmap.run,
    new_bitmap_bytes, &new_bitmap_bytes, true, NULL);
    diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c
    index 84ccc1409874..5c5ea05a5ef1 100644
    --- a/fs/ntfs3/index.c
    +++ b/fs/ntfs3/index.c
    @@ -1353,7 +1353,7 @@ static int indx_create_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,

    alloc->nres.valid_size = alloc->nres.data_size = cpu_to_le64(data_size);

    - err = ni_insert_resident(ni, bitmap_size(1), ATTR_BITMAP, in->name,
    + err = ni_insert_resident(ni, ntfs3_bitmap_size(1), ATTR_BITMAP, in->name,
    in->name_len, &bitmap, NULL, NULL);
    if (err)
    goto out2;
    @@ -1415,7 +1415,7 @@ static int indx_add_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,
    if (bmp) {
    /* Increase bitmap. */
    err = attr_set_size(ni, ATTR_BITMAP, in->name, in->name_len,
    - &indx->bitmap_run, bitmap_size(bit + 1),
    + &indx->bitmap_run, ntfs3_bitmap_size(bit + 1),
    NULL, true, NULL);
    if (err)
    goto out1;
    @@ -1973,7 +1973,7 @@ static int indx_shrink(struct ntfs_index *indx, struct ntfs_inode *ni,
    if (err)
    return err;

    - bpb = bitmap_size(bit);
    + bpb = ntfs3_bitmap_size(bit);
    if (bpb * 8 == nbits)
    return 0;

    diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h
    index 55d686e3c4ec..85210e610a3a 100644
    --- a/fs/ntfs3/ntfs_fs.h
    +++ b/fs/ntfs3/ntfs_fs.h
    @@ -945,7 +945,7 @@ static inline bool run_is_empty(struct runs_tree *run)
    }

    /* NTFS uses quad aligned bitmaps. */
    -static inline size_t bitmap_size(size_t bits)
    +static inline size_t ntfs3_bitmap_size(size_t bits)
    {
    return ALIGN((bits + 7) >> 3, 8);
    }
    diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
    index b41d7c824a50..7d48f886ac82 100644
    --- a/fs/ntfs3/super.c
    +++ b/fs/ntfs3/super.c
    @@ -1101,7 +1101,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

    /* Check bitmap boundary. */
    tt = sbi->used.bitmap.nbits;
    - if (inode->i_size < bitmap_size(tt)) {
    + if (inode->i_size < ntfs3_bitmap_size(tt)) {
    err = -EINVAL;
    goto put_inode_out;
    }
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-07-02 20:30    [W:2.538 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site