2020-11-26 20:10:33

by Jaegeuk Kim

[permalink] [raw]
Subject: [PATCH 1/4] f2fs: rename logical_to_blk and blk_to_logical

This patch renames two functions like below having u64.
- logical_to_blk to bytes_to_blks
- blk_to_logical to blks_to_bytes

Signed-off-by: Jaegeuk Kim <[email protected]>
---
fs/f2fs/data.c | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index be4da52604ed..a8612c6f40ab 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1808,14 +1808,14 @@ static int get_data_block_bmap(struct inode *inode, sector_t iblock,
NO_CHECK_TYPE, create);
}

-static inline sector_t logical_to_blk(struct inode *inode, loff_t offset)
+static inline u64 bytes_to_blks(struct inode *inode, u64 bytes)
{
- return (offset >> inode->i_blkbits);
+ return (bytes >> inode->i_blkbits);
}

-static inline loff_t blk_to_logical(struct inode *inode, sector_t blk)
+static inline u64 blks_to_bytes(struct inode *inode, u64 blks)
{
- return (blk << inode->i_blkbits);
+ return (blks << inode->i_blkbits);
}

static int f2fs_xattr_fiemap(struct inode *inode,
@@ -1843,7 +1843,7 @@ static int f2fs_xattr_fiemap(struct inode *inode,
return err;
}

- phys = (__u64)blk_to_logical(inode, ni.blk_addr);
+ phys = blks_to_bytes(inode, ni.blk_addr);
offset = offsetof(struct f2fs_inode, i_addr) +
sizeof(__le32) * (DEF_ADDRS_PER_INODE -
get_inline_xattr_addrs(inode));
@@ -1875,7 +1875,7 @@ static int f2fs_xattr_fiemap(struct inode *inode,
return err;
}

- phys = (__u64)blk_to_logical(inode, ni.blk_addr);
+ phys = blks_to_bytes(inode, ni.blk_addr);
len = inode->i_sb->s_blocksize;

f2fs_put_page(page, 1);
@@ -1945,18 +1945,18 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
goto out;
}

- if (logical_to_blk(inode, len) == 0)
- len = blk_to_logical(inode, 1);
+ if (bytes_to_blks(inode, len) == 0)
+ len = blks_to_bytes(inode, 1);

- start_blk = logical_to_blk(inode, start);
- last_blk = logical_to_blk(inode, start + len - 1);
+ start_blk = bytes_to_blks(inode, start);
+ last_blk = bytes_to_blks(inode, start + len - 1);

next:
memset(&map_bh, 0, sizeof(struct buffer_head));
map_bh.b_size = len;

if (compr_cluster)
- map_bh.b_size = blk_to_logical(inode, cluster_size - 1);
+ map_bh.b_size = blks_to_bytes(inode, cluster_size - 1);

ret = get_data_block(inode, start_blk, &map_bh, 0,
F2FS_GET_BLOCK_FIEMAP, &next_pgofs);
@@ -1967,7 +1967,7 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
if (!buffer_mapped(&map_bh)) {
start_blk = next_pgofs;

- if (blk_to_logical(inode, start_blk) < blk_to_logical(inode,
+ if (blks_to_bytes(inode, start_blk) < blks_to_bytes(inode,
max_inode_blocks(inode)))
goto prep_next;

@@ -1993,9 +1993,9 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
compr_cluster = false;


- logical = blk_to_logical(inode, start_blk - 1);
- phys = blk_to_logical(inode, map_bh.b_blocknr);
- size = blk_to_logical(inode, cluster_size);
+ logical = blks_to_bytes(inode, start_blk - 1);
+ phys = blks_to_bytes(inode, map_bh.b_blocknr);
+ size = blks_to_bytes(inode, cluster_size);

flags |= FIEMAP_EXTENT_ENCODED;

@@ -2013,14 +2013,14 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
goto prep_next;
}

- logical = blk_to_logical(inode, start_blk);
- phys = blk_to_logical(inode, map_bh.b_blocknr);
+ logical = blks_to_bytes(inode, start_blk);
+ phys = blks_to_bytes(inode, map_bh.b_blocknr);
size = map_bh.b_size;
flags = 0;
if (buffer_unwritten(&map_bh))
flags = FIEMAP_EXTENT_UNWRITTEN;

- start_blk += logical_to_blk(inode, size);
+ start_blk += bytes_to_blks(inode, size);

prep_next:
cond_resched();
@@ -3903,7 +3903,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis,
* to be very smart.
*/
cur_lblock = 0;
- last_lblock = logical_to_blk(inode, i_size_read(inode));
+ last_lblock = bytes_to_blks(inode, i_size_read(inode));
len = i_size_read(inode);

while (cur_lblock <= last_lblock && cur_lblock < sis->max) {
@@ -3925,7 +3925,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis,
goto err_out;

pblock = map_bh.b_blocknr;
- nr_pblocks = logical_to_blk(inode, map_bh.b_size);
+ nr_pblocks = bytes_to_blks(inode, map_bh.b_size);

if (cur_lblock + nr_pblocks >= sis->max)
nr_pblocks = sis->max - cur_lblock;
--
2.29.2.454.gaff20da3a2-goog


2020-11-26 20:35:37

by Jaegeuk Kim

[permalink] [raw]
Subject: [PATCH 3/4] f2fs: fix wrong block count instead of bytes

We should convert cur_lblock, a block count, to bytes for len.

Signed-off-by: Jaegeuk Kim <[email protected]>
---
fs/f2fs/data.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index a84e5bc09337..e49c14ccfafe 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3893,7 +3893,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis,
sector_t highest_pblock = 0;
int nr_extents = 0;
unsigned long nr_pblocks;
- unsigned long len;
+ u64 len;
int ret;

/*
@@ -3911,7 +3911,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis,
cond_resched();

memset(&map_bh, 0, sizeof(struct buffer_head));
- map_bh.b_size = len - cur_lblock;
+ map_bh.b_size = len - blks_to_bytes(inode, cur_lblock);

ret = get_data_block(inode, cur_lblock, &map_bh, 0,
F2FS_GET_BLOCK_FIEMAP, &next_pgofs);
--
2.29.2.454.gaff20da3a2-goog

2020-12-01 04:15:37

by Jaegeuk Kim

[permalink] [raw]
Subject: Re: [PATCH 3/4] f2fs: fix wrong block count instead of bytes

On 11/25, Jaegeuk Kim wrote:
> We should convert cur_lblock, a block count, to bytes for len.
>
> Signed-off-by: Jaegeuk Kim <[email protected]>
> ---
> fs/f2fs/data.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index a84e5bc09337..e49c14ccfafe 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -3893,7 +3893,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis,
> sector_t highest_pblock = 0;
> int nr_extents = 0;
> unsigned long nr_pblocks;
> - unsigned long len;
> + u64 len;
> int ret;
>
> /*
> @@ -3911,7 +3911,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis,
> cond_resched();
>
> memset(&map_bh, 0, sizeof(struct buffer_head));
> - map_bh.b_size = len - cur_lblock;
> + map_bh.b_size = len - blks_to_bytes(inode, cur_lblock);
>
> ret = get_data_block(inode, cur_lblock, &map_bh, 0,
> F2FS_GET_BLOCK_FIEMAP, &next_pgofs);
> --
> 2.29.2.454.gaff20da3a2-goog

2020-12-01 05:10:09

by Jaegeuk Kim

[permalink] [raw]
Subject: Re: [PATCH 1/4] f2fs: rename logical_to_blk and blk_to_logical

Forgot to add f2fs mailing list.

On 11/25, Jaegeuk Kim wrote:
> This patch renames two functions like below having u64.
> - logical_to_blk to bytes_to_blks
> - blk_to_logical to blks_to_bytes
>
> Signed-off-by: Jaegeuk Kim <[email protected]>
> ---
> fs/f2fs/data.c | 40 ++++++++++++++++++++--------------------
> 1 file changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index be4da52604ed..a8612c6f40ab 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -1808,14 +1808,14 @@ static int get_data_block_bmap(struct inode *inode, sector_t iblock,
> NO_CHECK_TYPE, create);
> }
>
> -static inline sector_t logical_to_blk(struct inode *inode, loff_t offset)
> +static inline u64 bytes_to_blks(struct inode *inode, u64 bytes)
> {
> - return (offset >> inode->i_blkbits);
> + return (bytes >> inode->i_blkbits);
> }
>
> -static inline loff_t blk_to_logical(struct inode *inode, sector_t blk)
> +static inline u64 blks_to_bytes(struct inode *inode, u64 blks)
> {
> - return (blk << inode->i_blkbits);
> + return (blks << inode->i_blkbits);
> }
>
> static int f2fs_xattr_fiemap(struct inode *inode,
> @@ -1843,7 +1843,7 @@ static int f2fs_xattr_fiemap(struct inode *inode,
> return err;
> }
>
> - phys = (__u64)blk_to_logical(inode, ni.blk_addr);
> + phys = blks_to_bytes(inode, ni.blk_addr);
> offset = offsetof(struct f2fs_inode, i_addr) +
> sizeof(__le32) * (DEF_ADDRS_PER_INODE -
> get_inline_xattr_addrs(inode));
> @@ -1875,7 +1875,7 @@ static int f2fs_xattr_fiemap(struct inode *inode,
> return err;
> }
>
> - phys = (__u64)blk_to_logical(inode, ni.blk_addr);
> + phys = blks_to_bytes(inode, ni.blk_addr);
> len = inode->i_sb->s_blocksize;
>
> f2fs_put_page(page, 1);
> @@ -1945,18 +1945,18 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> goto out;
> }
>
> - if (logical_to_blk(inode, len) == 0)
> - len = blk_to_logical(inode, 1);
> + if (bytes_to_blks(inode, len) == 0)
> + len = blks_to_bytes(inode, 1);
>
> - start_blk = logical_to_blk(inode, start);
> - last_blk = logical_to_blk(inode, start + len - 1);
> + start_blk = bytes_to_blks(inode, start);
> + last_blk = bytes_to_blks(inode, start + len - 1);
>
> next:
> memset(&map_bh, 0, sizeof(struct buffer_head));
> map_bh.b_size = len;
>
> if (compr_cluster)
> - map_bh.b_size = blk_to_logical(inode, cluster_size - 1);
> + map_bh.b_size = blks_to_bytes(inode, cluster_size - 1);
>
> ret = get_data_block(inode, start_blk, &map_bh, 0,
> F2FS_GET_BLOCK_FIEMAP, &next_pgofs);
> @@ -1967,7 +1967,7 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> if (!buffer_mapped(&map_bh)) {
> start_blk = next_pgofs;
>
> - if (blk_to_logical(inode, start_blk) < blk_to_logical(inode,
> + if (blks_to_bytes(inode, start_blk) < blks_to_bytes(inode,
> max_inode_blocks(inode)))
> goto prep_next;
>
> @@ -1993,9 +1993,9 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> compr_cluster = false;
>
>
> - logical = blk_to_logical(inode, start_blk - 1);
> - phys = blk_to_logical(inode, map_bh.b_blocknr);
> - size = blk_to_logical(inode, cluster_size);
> + logical = blks_to_bytes(inode, start_blk - 1);
> + phys = blks_to_bytes(inode, map_bh.b_blocknr);
> + size = blks_to_bytes(inode, cluster_size);
>
> flags |= FIEMAP_EXTENT_ENCODED;
>
> @@ -2013,14 +2013,14 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> goto prep_next;
> }
>
> - logical = blk_to_logical(inode, start_blk);
> - phys = blk_to_logical(inode, map_bh.b_blocknr);
> + logical = blks_to_bytes(inode, start_blk);
> + phys = blks_to_bytes(inode, map_bh.b_blocknr);
> size = map_bh.b_size;
> flags = 0;
> if (buffer_unwritten(&map_bh))
> flags = FIEMAP_EXTENT_UNWRITTEN;
>
> - start_blk += logical_to_blk(inode, size);
> + start_blk += bytes_to_blks(inode, size);
>
> prep_next:
> cond_resched();
> @@ -3903,7 +3903,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis,
> * to be very smart.
> */
> cur_lblock = 0;
> - last_lblock = logical_to_blk(inode, i_size_read(inode));
> + last_lblock = bytes_to_blks(inode, i_size_read(inode));
> len = i_size_read(inode);
>
> while (cur_lblock <= last_lblock && cur_lblock < sis->max) {
> @@ -3925,7 +3925,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis,
> goto err_out;
>
> pblock = map_bh.b_blocknr;
> - nr_pblocks = logical_to_blk(inode, map_bh.b_size);
> + nr_pblocks = bytes_to_blks(inode, map_bh.b_size);
>
> if (cur_lblock + nr_pblocks >= sis->max)
> nr_pblocks = sis->max - cur_lblock;
> --
> 2.29.2.454.gaff20da3a2-goog

2020-12-01 09:26:41

by Chao Yu

[permalink] [raw]
Subject: Re: [f2fs-dev] [PATCH 3/4] f2fs: fix wrong block count instead of bytes

On 2020/12/1 12:09, Jaegeuk Kim wrote:
> On 11/25, Jaegeuk Kim wrote:
>> We should convert cur_lblock, a block count, to bytes for len.
>>
>> Signed-off-by: Jaegeuk Kim <[email protected]>

Fixes: af4b6b8edf6a ("f2fs: introduce check_swap_activate_fast()")

Reviewed-by: Chao Yu <[email protected]>

Thanks,

2020-12-01 22:18:28

by Chao Yu

[permalink] [raw]
Subject: Re: [f2fs-dev] [PATCH 1/4] f2fs: rename logical_to_blk and blk_to_logical

On 2020/12/1 12:09, Jaegeuk Kim wrote:
> Forgot to add f2fs mailing list.
>
> On 11/25, Jaegeuk Kim wrote:
>> This patch renames two functions like below having u64.
>> - logical_to_blk to bytes_to_blks
>> - blk_to_logical to blks_to_bytes
>>
>> Signed-off-by: Jaegeuk Kim <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

Thanks,