From: Nikolay Borisov <nborisov@suse.com>
To: dsterba@suse.cz, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 4/7] btrfs: Don't opencode is_data_inode in end_bio_extent_readpage
Date: Wed, 23 Sep 2020 09:23:48 +0300 [thread overview]
Message-ID: <e6268502-272f-ff6f-b38c-24949d18dbe4@suse.com> (raw)
In-Reply-To: <20200921202909.GU6756@twin.jikos.cz>
On 21.09.20 г. 23:29 ч., David Sterba wrote:
> On Fri, Sep 18, 2020 at 04:34:36PM +0300, Nikolay Borisov wrote:
>> Use the is_data_inode helper.
>>
>> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
>> ---
>> fs/btrfs/extent_io.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
>> index 6e976bd86600..26b002e2f3b3 100644
>> --- a/fs/btrfs/extent_io.c
>> +++ b/fs/btrfs/extent_io.c
>> @@ -2816,8 +2816,7 @@ static void end_bio_extent_readpage(struct bio *bio)
>> struct page *page = bvec->bv_page;
>> struct inode *inode = page->mapping->host;
>> struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
>> - bool data_inode = btrfs_ino(BTRFS_I(inode))
>> - != BTRFS_BTREE_INODE_OBJECTID;
>> + bool data_inode = is_data_inode(inode);
>
> I think you can remove the temporary variable and call is_data_inode
> directly in the later code, there's only one use.
>
Actually it's used twice, yet I did an experiment to remove it and
bloat-o-meter indicates it's a win to call the inline function twice:
add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-161 (-161)
Function old new delta
end_bio_extent_readpage.cold 117 104 -13
end_bio_extent_readpage 1614 1466 -148
Total: Before=45527, After=45366, chg -0.35%
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index b5e00b62bcb1..0994fb56e39a 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2819,7 +2819,6 @@ static void end_bio_extent_readpage(struct bio *bio)
struct page *page = bvec->bv_page;
struct inode *inode = page->mapping->host;
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
- bool data_inode = is_data_inode(inode);
btrfs_debug(fs_info,
"end_bio_extent_readpage: bi_sector=%llu,
err=%d, mirror=%u",
@@ -2850,7 +2849,7 @@ static void end_bio_extent_readpage(struct bio *bio)
mirror = io_bio->mirror_num;
if (likely(uptodate)) {
- if (data_inode)
+ if (is_data_inode(inode))
ret = btrfs_check_csum(io_bio, offset, page,
start, end, mirror);
else
@@ -2868,7 +2867,7 @@ static void end_bio_extent_readpage(struct bio *bio)
if (likely(uptodate))
goto readpage_ok;
- if (data_inode) {
+ if (is_data_inode(inode)) {
/*
* The generic bio_readpage_error handles errors the
So I will fold this into the next version.
next prev parent reply other threads:[~2020-09-23 6:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 13:34 [PATCH 0/7] Remove struct extent_io_ops Nikolay Borisov
2020-09-18 13:34 ` [PATCH 1/7] btrfs: Don't call readpage_end_io_hook for the btree inode Nikolay Borisov
2020-09-18 13:41 ` Nikolay Borisov
2020-09-21 14:54 ` Johannes Thumshirn
2020-09-21 17:45 ` David Sterba
2020-09-23 6:29 ` Nikolay Borisov
2020-09-23 14:10 ` David Sterba
2020-09-18 13:34 ` [PATCH 2/7] btrfs: Remove extent_io_ops::readpage_end_io_hook Nikolay Borisov
2020-09-21 14:58 ` Johannes Thumshirn
2020-09-18 13:34 ` [PATCH 3/7] btrfs: Call submit_bio_hook directly in submit_one_bio Nikolay Borisov
2020-09-18 13:34 ` [PATCH 4/7] btrfs: Don't opencode is_data_inode in end_bio_extent_readpage Nikolay Borisov
2020-09-21 20:29 ` David Sterba
2020-09-23 6:23 ` Nikolay Borisov [this message]
2020-09-23 14:11 ` David Sterba
2020-09-18 13:34 ` [PATCH 5/7] btrfs: Stop calling submit_bio_hook for data inodes Nikolay Borisov
2020-09-18 13:34 ` [PATCH 6/7] btrfs: Call submit_bio_hook directly for metadata pages Nikolay Borisov
2020-09-21 15:04 ` Johannes Thumshirn
2020-09-21 20:32 ` David Sterba
2020-09-23 6:24 ` Nikolay Borisov
2020-09-18 13:34 ` [PATCH 7/7] btrfs: Remove struct extent_io_ops Nikolay Borisov
2020-09-21 20:38 ` David Sterba
2020-09-23 6:25 ` Nikolay Borisov
2020-09-23 14:19 ` David Sterba
2020-09-23 14:23 ` Nikolay Borisov
2020-09-23 15:09 ` David Sterba
2020-09-21 15:05 ` [PATCH 0/7] " Johannes Thumshirn
2020-09-24 11:35 ` 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=e6268502-272f-ff6f-b38c-24949d18dbe4@suse.com \
--to=nborisov@suse.com \
--cc=dsterba@suse.cz \
--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