From: Nikolay Borisov <nborisov@suse.com>
To: David Sterba <dsterba@suse.com>, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 05/14] btrfs: pass only eb to num_extent_pages
Date: Fri, 29 Jun 2018 12:08:10 +0300 [thread overview]
Message-ID: <52aa9c57-4e7c-1421-2c13-e1d114eeb112@suse.com> (raw)
In-Reply-To: <6dcc9a3bbb003dff2feff4328d27e5bf88b21e9d.1530262400.git.dsterba@suse.com>
On 29.06.2018 11:56, David Sterba wrote:
> Almost all callers pass the start and len as 2 arguments but this is not
> necessary, all the information is provided by the eb. By reordering the
> calls to num_extent_pages, we don't need the local variables with
> start/len.
>
> Reviewed-by: Nikolay Borisov <nborisov@suse.com>
> Signed-off-by: David Sterba <dsterba@suse.com>
> ---
> fs/btrfs/extent_io.c | 30 +++++++++++++++---------------
> fs/btrfs/extent_io.h | 6 +++---
> 2 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index 8e4a7cdbc9f5..577bbb026042 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -2062,7 +2062,7 @@ int repair_eb_io_failure(struct btrfs_fs_info *fs_info,
> struct extent_buffer *eb, int mirror_num)
> {
> u64 start = eb->start;
> - unsigned long i, num_pages = num_extent_pages(eb->start, eb->len);
> + unsigned long i, num_pages = num_extent_pages(eb);
> int ret = 0;
>
> if (sb_rdonly(fs_info->sb))
> @@ -3591,7 +3591,7 @@ lock_extent_buffer_for_io(struct extent_buffer *eb,
> if (!ret)
> return ret;
>
> - num_pages = num_extent_pages(eb->start, eb->len);
> + num_pages = num_extent_pages(eb);
> for (i = 0; i < num_pages; i++) {
> struct page *p = eb->pages[i];
>
> @@ -3721,7 +3721,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,
> int ret = 0;
>
> clear_bit(EXTENT_BUFFER_WRITE_ERR, &eb->bflags);
> - num_pages = num_extent_pages(eb->start, eb->len);
> + num_pages = num_extent_pages(eb);
> atomic_set(&eb->io_pages, num_pages);
>
> /* set btree blocks beyond nritems with 0 to avoid stale content. */
> @@ -4650,7 +4650,7 @@ static void btrfs_release_extent_buffer_page(struct extent_buffer *eb)
>
> BUG_ON(extent_buffer_under_io(eb));
>
> - index = num_extent_pages(eb->start, eb->len);
> + index = num_extent_pages(eb);
> if (index == 0)
> return;
>
> @@ -4743,7 +4743,7 @@ struct extent_buffer *btrfs_clone_extent_buffer(struct extent_buffer *src)
> unsigned long i;
> struct page *p;
> struct extent_buffer *new;
> - unsigned long num_pages = num_extent_pages(src->start, src->len);
> + unsigned long num_pages = num_extent_pages(src);
>
> new = __alloc_extent_buffer(src->fs_info, src->start, src->len);
> if (new == NULL)
> @@ -4775,12 +4775,11 @@ struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,
> unsigned long num_pages;
> unsigned long i;
>
> - num_pages = num_extent_pages(start, len);
> -
> eb = __alloc_extent_buffer(fs_info, start, len);
> if (!eb)
> return NULL;
>
> + num_pages = num_extent_pages(eb);
> for (i = 0; i < num_pages; i++) {
> eb->pages[i] = alloc_page(GFP_NOFS);
> if (!eb->pages[i])
> @@ -4844,7 +4843,7 @@ static void mark_extent_buffer_accessed(struct extent_buffer *eb,
>
> check_buffer_tree_ref(eb);
>
> - num_pages = num_extent_pages(eb->start, eb->len);
> + num_pages = num_extent_pages(eb);
> for (i = 0; i < num_pages; i++) {
> struct page *p = eb->pages[i];
>
> @@ -4941,7 +4940,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
> u64 start)
> {
> unsigned long len = fs_info->nodesize;
> - unsigned long num_pages = num_extent_pages(start, len);
> + unsigned long num_pages;
> unsigned long i;
> unsigned long index = start >> PAGE_SHIFT;
> struct extent_buffer *eb;
> @@ -4964,6 +4963,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
> if (!eb)
> return ERR_PTR(-ENOMEM);
>
> + num_pages = num_extent_pages(eb);
> for (i = 0; i < num_pages; i++, index++) {
> p = find_or_create_page(mapping, index, GFP_NOFS|__GFP_NOFAIL);
> if (!p) {
> @@ -5160,7 +5160,7 @@ void clear_extent_buffer_dirty(struct extent_buffer *eb)
> unsigned long num_pages;
> struct page *page;
>
> - num_pages = num_extent_pages(eb->start, eb->len);
> + num_pages = num_extent_pages(eb);
>
> for (i = 0; i < num_pages; i++) {
> page = eb->pages[i];
> @@ -5194,7 +5194,7 @@ int set_extent_buffer_dirty(struct extent_buffer *eb)
>
> was_dirty = test_and_set_bit(EXTENT_BUFFER_DIRTY, &eb->bflags);
>
> - num_pages = num_extent_pages(eb->start, eb->len);
> + num_pages = num_extent_pages(eb);
> WARN_ON(atomic_read(&eb->refs) == 0);
> WARN_ON(!test_bit(EXTENT_BUFFER_TREE_REF, &eb->bflags));
>
> @@ -5210,7 +5210,7 @@ void clear_extent_buffer_uptodate(struct extent_buffer *eb)
> unsigned long num_pages;
>
> clear_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);
> - num_pages = num_extent_pages(eb->start, eb->len);
> + num_pages = num_extent_pages(eb);
> for (i = 0; i < num_pages; i++) {
> page = eb->pages[i];
> if (page)
> @@ -5225,7 +5225,7 @@ void set_extent_buffer_uptodate(struct extent_buffer *eb)
> unsigned long num_pages;
>
> set_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);
> - num_pages = num_extent_pages(eb->start, eb->len);
> + num_pages = num_extent_pages(eb);
> for (i = 0; i < num_pages; i++) {
> page = eb->pages[i];
> SetPageUptodate(page);
> @@ -5249,7 +5249,7 @@ int read_extent_buffer_pages(struct extent_io_tree *tree,
> if (test_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags))
> return 0;
>
> - num_pages = num_extent_pages(eb->start, eb->len);
> + num_pages = num_extent_pages(eb);
> for (i = 0; i < num_pages; i++) {
> page = eb->pages[i];
> if (wait == WAIT_NONE) {
> @@ -5577,7 +5577,7 @@ void copy_extent_buffer_full(struct extent_buffer *dst,
>
> ASSERT(dst->len == src->len);
>
> - num_pages = num_extent_pages(dst->start, dst->len);
> + num_pages = num_extent_pages(dst);
> for (i = 0; i < num_pages; i++)
> copy_page(page_address(dst->pages[i]),
> page_address(src->pages[i]));
> diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
> index 0bfd4aeb822d..d8382a4a7f46 100644
> --- a/fs/btrfs/extent_io.h
> +++ b/fs/btrfs/extent_io.h
> @@ -440,10 +440,10 @@ int read_extent_buffer_pages(struct extent_io_tree *tree,
> int mirror_num);
> void wait_on_extent_buffer_writeback(struct extent_buffer *eb);
>
> -static inline unsigned long num_extent_pages(u64 start, u64 len)
> +static inline unsigned long num_extent_pages(const struct extent_buffer *eb)
> {
> - return ((start + len + PAGE_SIZE - 1) >> PAGE_SHIFT) -
> - (start >> PAGE_SHIFT);
> + return ((eb->start + eb->len + PAGE_SIZE - 1) >> PAGE_SHIFT) -
> + (eb->start >> PAGE_SHIFT);
This is a good opportunity to eliminate the open-coded round_up:
round_up(eb->start + eb->len, PAGE_SIZE)
> }
>
> static inline void extent_buffer_get(struct extent_buffer *eb)
>
next prev parent reply other threads:[~2018-06-29 9:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-29 8:56 [PATCH 00/14] Misc cleanups for 4.19 David Sterba
2018-06-29 8:56 ` [PATCH 01/14] btrfs: simplify some assignments of inode numbers David Sterba
2018-06-29 8:56 ` [PATCH 02/14] btrfs: simplify pointer chasing of local fs_info variables David Sterba
2018-06-29 8:56 ` [PATCH 03/14] btrfs: use copy_page for copying pages instead of memcpy David Sterba
2018-06-29 8:56 ` [PATCH 04/14] btrfs: prune unused includes David Sterba
2018-06-29 8:56 ` [PATCH 05/14] btrfs: pass only eb to num_extent_pages David Sterba
2018-06-29 9:08 ` Nikolay Borisov [this message]
2018-06-29 14:29 ` David Sterba
2018-06-29 15:12 ` Nikolay Borisov
2018-06-29 8:56 ` [PATCH 06/14] btrfs: switch types to int when counting eb pages David Sterba
2018-06-29 8:56 ` [PATCH 07/14] btrfs: open-code bio_set_op_attrs David Sterba
2018-06-29 8:56 ` [PATCH 08/14] btrfs: raid56: add new helper for starting async work David Sterba
2018-06-29 8:56 ` [PATCH 09/14] btrfs: raid56: use new helper for async_rmw_stripe David Sterba
2018-06-29 8:57 ` [PATCH 10/14] btrfs: raid56: use new helper for async_read_rebuild David Sterba
2018-06-29 8:57 ` [PATCH 11/14] btrfs: raid56: use new helper for async_scrub_parity David Sterba
2018-06-29 8:57 ` [PATCH 12/14] btrfs: raid56: merge rbio_is_full helpers David Sterba
2018-06-29 8:57 ` [PATCH 13/14] btrfs: raid56: don't lock stripe cache table when freeing David Sterba
2018-06-29 15:18 ` David Sterba
2018-06-29 8:57 ` [PATCH 14/14] btrfs: raid56: catch errors from full_stripe_write David Sterba
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=52aa9c57-4e7c-1421-2c13-e1d114eeb112@suse.com \
--to=nborisov@suse.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).