From: Naohiro Aota <naohiro.aota@wdc.com>
To: linux-btrfs@vger.kernel.org, David Sterba <dsterba@suse.com>
Cc: Josef Bacik <josef@toxicpanda.com>,
Nikolay Borisov <nborisov@suse.com>,
Naohiro Aota <naohiro.aota@wdc.com>
Subject: [PATCH v3 15/21] btrfs: drop unnecessary arguments from clustered allocation functions
Date: Tue, 25 Feb 2020 12:56:20 +0900 [thread overview]
Message-ID: <20200225035626.1049501-16-naohiro.aota@wdc.com> (raw)
In-Reply-To: <20200225035626.1049501-1-naohiro.aota@wdc.com>
Now that, find_free_extent_clustered() and find_free_extent_unclustered() can
access "last_ptr" from the "clustered" variable, we can drop it from the
arguments.
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/extent-tree.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 1ed12a033ba9..1c0c94a2a8e0 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3513,11 +3513,11 @@ struct find_free_extent_ctl {
* Return 0 means we have found a location and set ffe_ctl->found_offset.
*/
static int find_free_extent_clustered(struct btrfs_block_group *bg,
- struct btrfs_free_cluster *last_ptr,
- struct find_free_extent_ctl *ffe_ctl,
- struct btrfs_block_group **cluster_bg_ret)
+ struct find_free_extent_ctl *ffe_ctl,
+ struct btrfs_block_group **cluster_bg_ret)
{
struct btrfs_block_group *cluster_bg;
+ struct btrfs_free_cluster *last_ptr = ffe_ctl->last_ptr;
u64 aligned_cluster;
u64 offset;
int ret;
@@ -3617,9 +3617,9 @@ static int find_free_extent_clustered(struct btrfs_block_group *bg,
* Return -EAGAIN to inform caller that we need to re-search this block group
*/
static int find_free_extent_unclustered(struct btrfs_block_group *bg,
- struct btrfs_free_cluster *last_ptr,
- struct find_free_extent_ctl *ffe_ctl)
+ struct find_free_extent_ctl *ffe_ctl)
{
+ struct btrfs_free_cluster *last_ptr = ffe_ctl->last_ptr;
u64 offset;
/*
@@ -3685,15 +3685,13 @@ static int do_allocation_clustered(struct btrfs_block_group *block_group,
* Ok we want to try and use the cluster allocator, so lets look there
*/
if (ffe_ctl->last_ptr && ffe_ctl->use_cluster) {
- ret = find_free_extent_clustered(block_group, ffe_ctl->last_ptr,
- ffe_ctl, bg_ret);
+ ret = find_free_extent_clustered(block_group, ffe_ctl, bg_ret);
if (ret >= 0 || ret == -EAGAIN)
return ret;
/* ret == -ENOENT case falls through */
}
- return find_free_extent_unclustered(block_group, ffe_ctl->last_ptr,
- ffe_ctl);
+ return find_free_extent_unclustered(block_group, ffe_ctl);
}
static int do_allocation(struct btrfs_block_group *block_group,
--
2.25.1
next prev parent reply other threads:[~2020-02-25 3:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-25 3:56 [PATCH v3 00/21] btrfs: refactor and generalize chunk/dev_extent/extent allocation Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 01/21] btrfs: change type of full_search to bool Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 02/21] btrfs: do not BUG_ON with invalid profile Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 03/21] btrfs: introduce chunk allocation policy Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 04/21] btrfs: refactor find_free_dev_extent_start() Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 05/21] btrfs: introduce alloc_chunk_ctl Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 06/21] btrfs: factor out init_alloc_chunk_ctl Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 07/21] btrfs: factor out gather_device_info() Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 08/21] btrfs: factor out decide_stripe_size() Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 09/21] btrfs: factor out create_chunk() Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 10/21] btrfs: parameterize dev_extent_min Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 11/21] btrfs: introduce extent allocation policy Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 12/21] btrfs: move hint_byte into find_free_extent_ctl Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 13/21] btrfs: move variables for clustered allocation " Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 14/21] btrfs: factor out do_allocation() Naohiro Aota
2020-02-25 3:56 ` Naohiro Aota [this message]
2020-02-25 3:56 ` [PATCH v3 16/21] btrfs: factor out release_block_group() Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 17/21] btrfs: factor out found_extent() Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 18/21] btrfs: drop unnecessary arguments from find_free_extent_update_loop() Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 19/21] btrfs: factor out chunk_allocation_failed() Naohiro Aota
2020-02-25 3:56 ` [PATCH v3 20/21] btrfs: skip LOOP_NO_EMPTY_SIZE if not clustered allocation Naohiro Aota
2020-02-28 14:20 ` David Sterba
2020-02-25 3:56 ` [PATCH v3 21/21] btrfs: factor out prepare_allocation() Naohiro Aota
2020-02-25 14:34 ` [PATCH v3 00/21] btrfs: refactor and generalize chunk/dev_extent/extent allocation David Sterba
2020-02-28 14:32 ` 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=20200225035626.1049501-16-naohiro.aota@wdc.com \
--to=naohiro.aota@wdc.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.com \
/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.