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 2/4] f2fs: use new conversion functions between blks and bytes
Date: Mon, 30 Nov 2020 20:09:44 -0800 [thread overview]
Message-ID: <20201201040944.GD3858797@google.com> (raw)
In-Reply-To: <20201126022416.3068426-2-jaegeuk@kernel.org>
On 11/25, Jaegeuk Kim wrote:
> This patch cleans up blks and bytes conversions.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fs/f2fs/data.c | 46 +++++++++++++++++++++-------------------------
> 1 file changed, 21 insertions(+), 25 deletions(-)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index a8612c6f40ab..a84e5bc09337 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -1750,6 +1750,16 @@ bool f2fs_overwrite_io(struct inode *inode, loff_t pos, size_t len)
> return true;
> }
>
> +static inline u64 bytes_to_blks(struct inode *inode, u64 bytes)
> +{
> + return (bytes >> inode->i_blkbits);
> +}
> +
> +static inline u64 blks_to_bytes(struct inode *inode, u64 blks)
> +{
> + return (blks << inode->i_blkbits);
> +}
> +
> static int __get_data_block(struct inode *inode, sector_t iblock,
> struct buffer_head *bh, int create, int flag,
> pgoff_t *next_pgofs, int seg_type, bool may_write)
> @@ -1758,7 +1768,7 @@ static int __get_data_block(struct inode *inode, sector_t iblock,
> int err;
>
> map.m_lblk = iblock;
> - map.m_len = bh->b_size >> inode->i_blkbits;
> + map.m_len = bytes_to_blks(inode, bh->b_size);
> map.m_next_pgofs = next_pgofs;
> map.m_next_extent = NULL;
> map.m_seg_type = seg_type;
> @@ -1768,7 +1778,7 @@ static int __get_data_block(struct inode *inode, sector_t iblock,
> if (!err) {
> map_bh(bh, inode->i_sb, map.m_pblk);
> bh->b_state = (bh->b_state & ~F2FS_MAP_FLAGS) | map.m_flags;
> - bh->b_size = (u64)map.m_len << inode->i_blkbits;
> + bh->b_size = blks_to_bytes(inode, map.m_len);
> }
> return err;
> }
> @@ -1808,16 +1818,6 @@ static int get_data_block_bmap(struct inode *inode, sector_t iblock,
> NO_CHECK_TYPE, create);
> }
>
> -static inline u64 bytes_to_blks(struct inode *inode, u64 bytes)
> -{
> - return (bytes >> inode->i_blkbits);
> -}
> -
> -static inline u64 blks_to_bytes(struct inode *inode, u64 blks)
> -{
> - return (blks << inode->i_blkbits);
> -}
> -
> static int f2fs_xattr_fiemap(struct inode *inode,
> struct fiemap_extent_info *fieinfo)
> {
> @@ -2053,8 +2053,7 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page,
> bool is_readahead)
> {
> struct bio *bio = *bio_ret;
> - const unsigned blkbits = inode->i_blkbits;
> - const unsigned blocksize = 1 << blkbits;
> + const unsigned blocksize = blks_to_bytes(inode, 1);
> sector_t block_in_file;
> sector_t last_block;
> sector_t last_block_in_file;
> @@ -2063,8 +2062,8 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page,
>
> block_in_file = (sector_t)page_index(page);
> last_block = block_in_file + nr_pages;
> - last_block_in_file = (f2fs_readpage_limit(inode) + blocksize - 1) >>
> - blkbits;
> + last_block_in_file = bytes_to_blks(inode,
> + f2fs_readpage_limit(inode) + blocksize - 1);
> if (last_block > last_block_in_file)
> last_block = last_block_in_file;
>
> @@ -2177,16 +2176,15 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,
> struct bio *bio = *bio_ret;
> unsigned int start_idx = cc->cluster_idx << cc->log_cluster_size;
> sector_t last_block_in_file;
> - const unsigned blkbits = inode->i_blkbits;
> - const unsigned blocksize = 1 << blkbits;
> + const unsigned blocksize = blks_to_bytes(inode, 1);
> struct decompress_io_ctx *dic = NULL;
> int i;
> int ret = 0;
>
> f2fs_bug_on(sbi, f2fs_cluster_is_empty(cc));
>
> - last_block_in_file = (f2fs_readpage_limit(inode) +
> - blocksize - 1) >> blkbits;
> + last_block_in_file = bytes_to_blks(inode,
> + f2fs_readpage_limit(inode) + blocksize - 1);
>
> /* get rid of pages beyond EOF */
> for (i = 0; i < cc->cluster_size; i++) {
> @@ -3968,7 +3966,6 @@ static int check_swap_activate(struct swap_info_struct *sis,
> struct inode *inode = mapping->host;
> unsigned blocks_per_page;
> unsigned long page_no;
> - unsigned blkbits;
> sector_t probe_block;
> sector_t last_block;
> sector_t lowest_block = -1;
> @@ -3979,8 +3976,7 @@ static int check_swap_activate(struct swap_info_struct *sis,
> if (PAGE_SIZE == F2FS_BLKSIZE)
> return check_swap_activate_fast(sis, swap_file, span);
>
> - blkbits = inode->i_blkbits;
> - blocks_per_page = PAGE_SIZE >> blkbits;
> + blocks_per_page = bytes_to_blks(inode, PAGE_SIZE);
>
> /*
> * Map all the blocks into the extent list. This code doesn't try
> @@ -3988,7 +3984,7 @@ static int check_swap_activate(struct swap_info_struct *sis,
> */
> probe_block = 0;
> page_no = 0;
> - last_block = i_size_read(inode) >> blkbits;
> + last_block = bytes_to_blks(inode, i_size_read(inode));
> while ((probe_block + blocks_per_page) <= last_block &&
> page_no < sis->max) {
> unsigned block_in_page;
> @@ -4028,7 +4024,7 @@ static int check_swap_activate(struct swap_info_struct *sis,
> }
> }
>
> - first_block >>= (PAGE_SHIFT - blkbits);
> + first_block >>= (PAGE_SHIFT - inode->i_blkbits);
> if (page_no) { /* exclude the header page */
> if (first_block < lowest_block)
> lowest_block = first_block;
> --
> 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 2/4] f2fs: use new conversion functions between blks and bytes
Date: Mon, 30 Nov 2020 20:09:44 -0800 [thread overview]
Message-ID: <20201201040944.GD3858797@google.com> (raw)
In-Reply-To: <20201126022416.3068426-2-jaegeuk@kernel.org>
On 11/25, Jaegeuk Kim wrote:
> This patch cleans up blks and bytes conversions.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fs/f2fs/data.c | 46 +++++++++++++++++++++-------------------------
> 1 file changed, 21 insertions(+), 25 deletions(-)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index a8612c6f40ab..a84e5bc09337 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -1750,6 +1750,16 @@ bool f2fs_overwrite_io(struct inode *inode, loff_t pos, size_t len)
> return true;
> }
>
> +static inline u64 bytes_to_blks(struct inode *inode, u64 bytes)
> +{
> + return (bytes >> inode->i_blkbits);
> +}
> +
> +static inline u64 blks_to_bytes(struct inode *inode, u64 blks)
> +{
> + return (blks << inode->i_blkbits);
> +}
> +
> static int __get_data_block(struct inode *inode, sector_t iblock,
> struct buffer_head *bh, int create, int flag,
> pgoff_t *next_pgofs, int seg_type, bool may_write)
> @@ -1758,7 +1768,7 @@ static int __get_data_block(struct inode *inode, sector_t iblock,
> int err;
>
> map.m_lblk = iblock;
> - map.m_len = bh->b_size >> inode->i_blkbits;
> + map.m_len = bytes_to_blks(inode, bh->b_size);
> map.m_next_pgofs = next_pgofs;
> map.m_next_extent = NULL;
> map.m_seg_type = seg_type;
> @@ -1768,7 +1778,7 @@ static int __get_data_block(struct inode *inode, sector_t iblock,
> if (!err) {
> map_bh(bh, inode->i_sb, map.m_pblk);
> bh->b_state = (bh->b_state & ~F2FS_MAP_FLAGS) | map.m_flags;
> - bh->b_size = (u64)map.m_len << inode->i_blkbits;
> + bh->b_size = blks_to_bytes(inode, map.m_len);
> }
> return err;
> }
> @@ -1808,16 +1818,6 @@ static int get_data_block_bmap(struct inode *inode, sector_t iblock,
> NO_CHECK_TYPE, create);
> }
>
> -static inline u64 bytes_to_blks(struct inode *inode, u64 bytes)
> -{
> - return (bytes >> inode->i_blkbits);
> -}
> -
> -static inline u64 blks_to_bytes(struct inode *inode, u64 blks)
> -{
> - return (blks << inode->i_blkbits);
> -}
> -
> static int f2fs_xattr_fiemap(struct inode *inode,
> struct fiemap_extent_info *fieinfo)
> {
> @@ -2053,8 +2053,7 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page,
> bool is_readahead)
> {
> struct bio *bio = *bio_ret;
> - const unsigned blkbits = inode->i_blkbits;
> - const unsigned blocksize = 1 << blkbits;
> + const unsigned blocksize = blks_to_bytes(inode, 1);
> sector_t block_in_file;
> sector_t last_block;
> sector_t last_block_in_file;
> @@ -2063,8 +2062,8 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page,
>
> block_in_file = (sector_t)page_index(page);
> last_block = block_in_file + nr_pages;
> - last_block_in_file = (f2fs_readpage_limit(inode) + blocksize - 1) >>
> - blkbits;
> + last_block_in_file = bytes_to_blks(inode,
> + f2fs_readpage_limit(inode) + blocksize - 1);
> if (last_block > last_block_in_file)
> last_block = last_block_in_file;
>
> @@ -2177,16 +2176,15 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,
> struct bio *bio = *bio_ret;
> unsigned int start_idx = cc->cluster_idx << cc->log_cluster_size;
> sector_t last_block_in_file;
> - const unsigned blkbits = inode->i_blkbits;
> - const unsigned blocksize = 1 << blkbits;
> + const unsigned blocksize = blks_to_bytes(inode, 1);
> struct decompress_io_ctx *dic = NULL;
> int i;
> int ret = 0;
>
> f2fs_bug_on(sbi, f2fs_cluster_is_empty(cc));
>
> - last_block_in_file = (f2fs_readpage_limit(inode) +
> - blocksize - 1) >> blkbits;
> + last_block_in_file = bytes_to_blks(inode,
> + f2fs_readpage_limit(inode) + blocksize - 1);
>
> /* get rid of pages beyond EOF */
> for (i = 0; i < cc->cluster_size; i++) {
> @@ -3968,7 +3966,6 @@ static int check_swap_activate(struct swap_info_struct *sis,
> struct inode *inode = mapping->host;
> unsigned blocks_per_page;
> unsigned long page_no;
> - unsigned blkbits;
> sector_t probe_block;
> sector_t last_block;
> sector_t lowest_block = -1;
> @@ -3979,8 +3976,7 @@ static int check_swap_activate(struct swap_info_struct *sis,
> if (PAGE_SIZE == F2FS_BLKSIZE)
> return check_swap_activate_fast(sis, swap_file, span);
>
> - blkbits = inode->i_blkbits;
> - blocks_per_page = PAGE_SIZE >> blkbits;
> + blocks_per_page = bytes_to_blks(inode, PAGE_SIZE);
>
> /*
> * Map all the blocks into the extent list. This code doesn't try
> @@ -3988,7 +3984,7 @@ static int check_swap_activate(struct swap_info_struct *sis,
> */
> probe_block = 0;
> page_no = 0;
> - last_block = i_size_read(inode) >> blkbits;
> + last_block = bytes_to_blks(inode, i_size_read(inode));
> while ((probe_block + blocks_per_page) <= last_block &&
> page_no < sis->max) {
> unsigned block_in_page;
> @@ -4028,7 +4024,7 @@ static int check_swap_activate(struct swap_info_struct *sis,
> }
> }
>
> - first_block >>= (PAGE_SHIFT - blkbits);
> + first_block >>= (PAGE_SHIFT - inode->i_blkbits);
> if (page_no) { /* exclude the header page */
> if (first_block < lowest_block)
> lowest_block = first_block;
> --
> 2.29.2.454.gaff20da3a2-goog
next prev parent reply other threads:[~2020-12-01 4:10 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 ` Jaegeuk Kim [this message]
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 ` [f2fs-dev] [PATCH 1/4] f2fs: rename logical_to_blk and blk_to_logical Jaegeuk Kim
2020-12-01 4:09 ` 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=20201201040944.GD3858797@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.