From: Nikolay Borisov <nborisov@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH 2/2] btrfs: Move free_pages_out label in inline extent handling branch in compress_file_range
Date: Wed, 17 Jul 2019 14:41:45 +0300 [thread overview]
Message-ID: <20190717114145.27731-2-nborisov@suse.com> (raw)
In-Reply-To: <20190717114145.27731-1-nborisov@suse.com>
This label is only executed if compress_file_range fails to create an
inline extent. So move its code in the semantically related inline
extent handling branch. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
fs/btrfs/inode.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 53f973161e6d..a84d73b670ff 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -601,7 +601,14 @@ static noinline int compress_file_range(struct async_chunk *async_chunk)
PAGE_SET_WRITEBACK |
page_error_op |
PAGE_END_WRITEBACK);
- goto free_pages_out;
+
+ for (i = 0; i < nr_pages; i++) {
+ WARN_ON(pages[i]->mapping);
+ put_page(pages[i]);
+ }
+ kfree(pages);
+
+ return 0;
}
}
@@ -679,15 +686,6 @@ static noinline int compress_file_range(struct async_chunk *async_chunk)
compressed_extents += 1;
return compressed_extents;
-
-free_pages_out:
- for (i = 0; i < nr_pages; i++) {
- WARN_ON(pages[i]->mapping);
- put_page(pages[i]);
- }
- kfree(pages);
-
- return 0;
}
static void free_async_extent_pages(struct async_extent *async_extent)
--
2.17.1
next prev parent reply other threads:[~2019-07-17 11:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 11:41 [PATCH 1/2] btrfs: Return number of compressed extents directly in compress_file_range Nikolay Borisov
2019-07-17 11:41 ` Nikolay Borisov [this message]
2019-07-25 15:51 ` David Sterba
-- strict thread matches above, loose matches on Subject: below --
2019-07-01 16:50 Nikolay Borisov
2019-07-01 16:50 ` [PATCH 2/2] btrfs: Move free_pages_out label in inline extent handling branch " Nikolay Borisov
2019-07-02 2:20 ` Qu Wenruo
2019-07-02 4:39 ` Anand Jain
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=20190717114145.27731-2-nborisov@suse.com \
--to=nborisov@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).