From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-kernel@vger.kernel.org, kernel-team@android.com
Cc: Linux F2FS Dev Mailing List <linux-f2fs-devel@lists.sourceforge.net>
Subject: Re: [f2fs-dev] [PATCH 1/4] f2fs: rename logical_to_blk and blk_to_logical
Date: Mon, 30 Nov 2020 20:09:04 -0800 [thread overview]
Message-ID: <20201201040904.GA3858797@google.com> (raw)
In-Reply-To: <20201126022416.3068426-1-jaegeuk@kernel.org>
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 <jaegeuk@kernel.org>
> ---
> 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
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
WARNING: multiple messages have this Message-ID (diff)
From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-kernel@vger.kernel.org, kernel-team@android.com
Cc: Linux F2FS Dev Mailing List <linux-f2fs-devel@lists.sourceforge.net>
Subject: Re: [PATCH 1/4] f2fs: rename logical_to_blk and blk_to_logical
Date: Mon, 30 Nov 2020 20:09:04 -0800 [thread overview]
Message-ID: <20201201040904.GA3858797@google.com> (raw)
In-Reply-To: <20201126022416.3068426-1-jaegeuk@kernel.org>
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 <jaegeuk@kernel.org>
> ---
> 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
next prev parent reply other threads:[~2020-12-01 4:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 2:24 [PATCH 1/4] f2fs: rename logical_to_blk and blk_to_logical Jaegeuk Kim
2020-11-26 2:24 ` [PATCH 2/4] f2fs: use new conversion functions between blks and bytes Jaegeuk Kim
2020-12-01 4:09 ` [f2fs-dev] " Jaegeuk Kim
2020-12-01 4:09 ` Jaegeuk Kim
2020-12-01 9:00 ` [f2fs-dev] " Chao Yu
2020-12-01 9:00 ` Chao Yu
2020-11-26 2:24 ` [PATCH 3/4] f2fs: fix wrong block count instead of bytes Jaegeuk Kim
2020-12-01 4:09 ` [f2fs-dev] " Jaegeuk Kim
2020-12-01 4:09 ` Jaegeuk Kim
2020-12-01 9:03 ` [f2fs-dev] " Chao Yu
2020-12-01 9:03 ` Chao Yu
2020-11-26 2:24 ` [PATCH 4/4] f2fs: remove buffer_head which has 32bits limit Jaegeuk Kim
2020-12-01 4:09 ` [f2fs-dev] " Jaegeuk Kim
2020-12-01 4:09 ` Jaegeuk Kim
2020-12-02 1:47 ` [f2fs-dev] " Chao Yu
2020-12-02 1:47 ` Chao Yu
2020-12-01 4:09 ` Jaegeuk Kim [this message]
2020-12-01 4:09 ` [PATCH 1/4] f2fs: rename logical_to_blk and blk_to_logical Jaegeuk Kim
2020-12-01 8:55 ` [f2fs-dev] " Chao Yu
2020-12-01 8:55 ` Chao Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201201040904.GA3858797@google.com \
--to=jaegeuk@kernel.org \
--cc=kernel-team@android.com \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.