From: Nikolay Borisov <nborisov@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH 05/15] btrfs-progs: Make update_block_group take fs_info instead of root
Date: Fri, 8 Jun 2018 15:47:48 +0300 [thread overview]
Message-ID: <1528462078-24490-6-git-send-email-nborisov@suse.com> (raw)
In-Reply-To: <1528462078-24490-1-git-send-email-nborisov@suse.com>
This is in preparation of delayed refs code.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
extent-tree.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/extent-tree.c b/extent-tree.c
index 07b5fb99e8cf..6e7a19323efc 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -1912,12 +1912,10 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
return 0;
}
-static int update_block_group(struct btrfs_root *root,
- u64 bytenr, u64 num_bytes, int alloc,
- int mark_free)
+static int update_block_group(struct btrfs_fs_info *info, u64 bytenr,
+ u64 num_bytes, int alloc, int mark_free)
{
struct btrfs_block_group_cache *cache;
- struct btrfs_fs_info *info = root->fs_info;
u64 total = num_bytes;
u64 old_val;
u64 byte_in_group;
@@ -2368,7 +2366,8 @@ static int __free_extent(struct btrfs_trans_handle *trans,
BUG_ON(ret);
}
- update_block_group(root, bytenr, num_bytes, 0, mark_free);
+ update_block_group(trans->fs_info, bytenr, num_bytes, 0,
+ mark_free);
}
fail:
btrfs_free_path(path);
@@ -2730,7 +2729,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
btrfs_mark_buffer_dirty(leaf);
btrfs_free_path(path);
- ret = update_block_group(root, ins->objectid, fs_info->nodesize,
+ ret = update_block_group(fs_info, ins->objectid, fs_info->nodesize,
1, 0);
return ret;
}
@@ -3413,7 +3412,7 @@ int btrfs_update_block_group(struct btrfs_root *root,
u64 bytenr, u64 num_bytes, int alloc,
int mark_free)
{
- return update_block_group(root, bytenr, num_bytes,
+ return update_block_group(root->fs_info, bytenr, num_bytes,
alloc, mark_free);
}
--
2.7.4
next prev parent reply other threads:[~2018-06-08 12:48 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-08 12:47 [PATCH 00/15] Add delayed-refs support to btrfs-progs Nikolay Borisov
2018-06-08 12:47 ` [PATCH 01/15] btrfs-progs: Remove root argument from pin_down_bytes Nikolay Borisov
2018-06-11 4:41 ` Qu Wenruo
2018-06-08 12:47 ` [PATCH 02/15] btrfs-progs: Remove root argument from btrfs_del_csums Nikolay Borisov
2018-06-11 4:46 ` Qu Wenruo
2018-06-11 7:02 ` Nikolay Borisov
2018-06-11 7:40 ` Qu Wenruo
2018-06-11 7:48 ` Nikolay Borisov
2018-06-11 8:08 ` Qu Wenruo
2018-06-11 8:09 ` Nikolay Borisov
2018-06-08 12:47 ` [PATCH 03/15] btrfs-progs: Add functions to modify the used space by a root Nikolay Borisov
2018-06-11 4:47 ` Qu Wenruo
2018-06-08 12:47 ` [PATCH 04/15] btrfs-progs: Refactor the root used bytes are updated Nikolay Borisov
2018-06-08 12:47 ` Nikolay Borisov [this message]
2018-06-11 4:49 ` [PATCH 05/15] btrfs-progs: Make update_block_group take fs_info instead of root Qu Wenruo
2018-06-08 12:47 ` [PATCH 06/15] btrfs-progs: check: Drop trans/root arguments from free_extent_hook Nikolay Borisov
2018-06-11 4:55 ` Qu Wenruo
2018-06-11 7:04 ` Nikolay Borisov
2018-06-08 12:47 ` [PATCH 07/15] btrfs-progs: Remove root argument from __free_extent Nikolay Borisov
2018-06-11 4:58 ` Qu Wenruo
2018-06-11 7:06 ` Nikolay Borisov
2018-06-08 12:47 ` [PATCH 08/15] btrfs-progs: Remove root argument from alloc_reserved_tree_block Nikolay Borisov
2018-06-08 12:47 ` [PATCH 09/15] btrfs-progs: Always pass 0 for offset when calling btrfs_free_extent for btree blocks Nikolay Borisov
2018-06-11 5:05 ` Qu Wenruo
2018-06-08 12:47 ` [PATCH 10/15] btrfs-progs: Add boolean to signal whether we are re-initing extent tree Nikolay Borisov
2018-06-08 12:47 ` [PATCH 11/15] btrfs-progs: Add delayed refs infrastructure Nikolay Borisov
2018-06-08 14:53 ` [PATCH 11/15 v2] " Nikolay Borisov
2018-06-11 5:20 ` [PATCH 11/15] " Qu Wenruo
2018-06-11 7:10 ` Nikolay Borisov
2018-06-11 7:46 ` Qu Wenruo
2018-07-30 8:34 ` Misono Tomohiro
2018-07-30 9:11 ` Nikolay Borisov
2018-08-02 12:17 ` David Sterba
2018-06-08 12:47 ` [PATCH 12/15] btrfs-progs: Add __free_extent2 function Nikolay Borisov
2018-06-08 12:47 ` [PATCH 13/15] btrfs-progs: Add alloc_reserved_tree_block2 function Nikolay Borisov
2018-06-08 12:47 ` [PATCH 14/15] btrfs-progs: Wire up delayed refs Nikolay Borisov
2018-07-30 8:33 ` Misono Tomohiro
2018-07-30 9:30 ` Nikolay Borisov
2018-06-08 12:47 ` [PATCH 15/15] btrfs-progs: Remove old delayed refs infrastructure Nikolay Borisov
2018-06-08 14:49 ` [PATCH 15/15 v2] " Nikolay Borisov
2018-06-08 13:50 ` [PATCH 00/15] Add delayed-refs support to btrfs-progs Qu Wenruo
2018-06-08 14:08 ` Nikolay Borisov
2018-06-08 14:21 ` Qu Wenruo
2018-07-16 15:39 ` David Sterba
2018-09-12 11:51 ` Su Yue
2018-09-12 18:02 ` 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=1528462078-24490-6-git-send-email-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).