lkml.org 
[lkml]   [2023]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 06/11] fs/ntfs3: add prefix to bitmap_size() and use BITS_TO_U64()
    Date
    bitmap_size() is a pretty generic name and one may want to use it for
    a generic bitmap API function. At the same time, its logic is
    NTFS-specific, as it aligns to the sizeof(u64), not the sizeof(long)
    (although it uses ideologically right ALIGN() instead of division).
    Add the prefix 'ntfs3_' used for that FS (not just 'ntfs_' to not mix
    it with the legacy module) and use generic BITS_TO_U64() while at it.

    Suggested-by: Yury Norov <yury.norov@gmail.com> # BITS_TO_U64()
    Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
    Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
    ---
    fs/ntfs3/bitmap.c | 4 ++--
    fs/ntfs3/fsntfs.c | 2 +-
    fs/ntfs3/index.c | 11 ++++++-----
    fs/ntfs3/ntfs_fs.h | 4 ++--
    fs/ntfs3/super.c | 2 +-
    5 files changed, 12 insertions(+), 11 deletions(-)

    diff --git a/fs/ntfs3/bitmap.c b/fs/ntfs3/bitmap.c
    index 63f14a0232f6..a19a73ed630b 100644
    --- a/fs/ntfs3/bitmap.c
    +++ b/fs/ntfs3/bitmap.c
    @@ -654,7 +654,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;
    @@ -1347,7 +1347,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 fbfe21dbb425..e18de9c4c2fa 100644
    --- a/fs/ntfs3/fsntfs.c
    +++ b/fs/ntfs3/fsntfs.c
    @@ -522,7 +522,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 cf92b2433f7a..e0cef8f4e414 100644
    --- a/fs/ntfs3/index.c
    +++ b/fs/ntfs3/index.c
    @@ -1456,8 +1456,8 @@ 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,
    - in->name_len, &bitmap, NULL, NULL);
    + err = ni_insert_resident(ni, ntfs3_bitmap_size(1), ATTR_BITMAP,
    + in->name, in->name_len, &bitmap, NULL, NULL);
    if (err)
    goto out2;

    @@ -1518,8 +1518,9 @@ 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),
    - NULL, true, NULL);
    + &indx->bitmap_run,
    + ntfs3_bitmap_size(bit + 1), NULL, true,
    + NULL);
    if (err)
    goto out1;
    }
    @@ -2092,7 +2093,7 @@ static int indx_shrink(struct ntfs_index *indx, struct ntfs_inode *ni,
    if (in->name == I30_NAME)
    ni->vfs_inode.i_size = new_data;

    - 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 f6706143d14b..16b84d605cd2 100644
    --- a/fs/ntfs3/ntfs_fs.h
    +++ b/fs/ntfs3/ntfs_fs.h
    @@ -961,9 +961,9 @@ 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);
    + return BITS_TO_U64(bits) * sizeof(u64);
    }

    #define _100ns2seconds 10000000
    diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
    index 9153dffde950..0248db1e5c01 100644
    --- a/fs/ntfs3/super.c
    +++ b/fs/ntfs3/super.c
    @@ -1331,7 +1331,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)) {
    ntfs_err(sb, "$Bitmap is corrupted.");
    err = -EINVAL;
    goto put_inode_out;
    --
    2.41.0
    \
     
     \ /
      Last update: 2023-11-20 13:58    [W:3.397 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site