@@ -102,6 +102,15 @@ struct extent_io_extra_options {
* For qgroup related functions.
*/
struct extent_changeset *changeset;
+
+ /*
+ * For __clear_extent_bit().
+ * @wake: Wake up the waiters. Mostly for EXTENT_LOCKED case
+ * @delete: Delete the extent regardless of its state. Mostly for
+ * cleanup.
+ */
+ bool wake;
+ bool delete;
};
int __init extent_state_cache_init(void);
@@ -139,9 +148,8 @@ int clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits, int wake, int delete,
struct extent_state **cached);
int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
- unsigned bits, int wake, int delete,
- struct extent_state **cached, gfp_t mask,
- struct extent_changeset *changeset);
+ unsigned bits, struct extent_state **cached_state,
+ gfp_t mask, struct extent_io_extra_options *extra_opts);
static inline int unlock_extent(struct extent_io_tree *tree, u64 start, u64 end)
{
@@ -151,15 +159,21 @@ static inline int unlock_extent(struct extent_io_tree *tree, u64 start, u64 end)
static inline int unlock_extent_cached(struct extent_io_tree *tree, u64 start,
u64 end, struct extent_state **cached)
{
- return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, 1, 0, cached,
- GFP_NOFS, NULL);
+ struct extent_io_extra_options extra_opts = {
+ .wake = true,
+ };
+ return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, cached,
+ GFP_NOFS, &extra_opts);
}
static inline int unlock_extent_cached_atomic(struct extent_io_tree *tree,
u64 start, u64 end, struct extent_state **cached)
{
- return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, 1, 0, cached,
- GFP_ATOMIC, NULL);
+ struct extent_io_extra_options extra_opts = {
+ .wake = true,
+ };
+ return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, cached,
+ GFP_ATOMIC, &extra_opts);
}
static inline int clear_extent_bits(struct extent_io_tree *tree, u64 start,
@@ -190,7 +204,7 @@ static inline int set_extent_bits(struct extent_io_tree *tree, u64 start,
static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,
u64 end, struct extent_state **cached_state)
{
- return __clear_extent_bit(tree, start, end, EXTENT_UPTODATE, 0, 0,
+ return __clear_extent_bit(tree, start, end, EXTENT_UPTODATE,
cached_state, GFP_NOFS, NULL);
}
@@ -688,26 +688,38 @@ static void extent_io_tree_panic(struct extent_io_tree *tree, int err)
* or inserting elements in the tree, so the gfp mask is used to
* indicate which allocations or sleeping are allowed.
*
- * pass 'wake' == 1 to kick any sleepers, and 'delete' == 1 to remove
- * the given range from the tree regardless of state (ie for truncate).
+ * extar_opts::wake: To kick any sleeps.
+ * extra_opts::delete: To remove the given range regardless of state
+ * (ie for truncate)
+ * extra_opts::changeset: To record how many bytes are modified and
+ * which ranges are modified. (for qgroup)
*
- * the range [start, end] is inclusive.
+ * The range [start, end] is inclusive.
*
- * This takes the tree lock, and returns 0 on success and < 0 on error.
+ * Returns 0 on success
+ * No error can be returned yet, the ENOMEM for memory is handled by BUG_ON().
*/
int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
- unsigned bits, int wake, int delete,
- struct extent_state **cached_state,
- gfp_t mask, struct extent_changeset *changeset)
+ unsigned bits, struct extent_state **cached_state,
+ gfp_t mask, struct extent_io_extra_options *extra_opts)
{
+ struct extent_changeset *changeset;
struct extent_state *state;
struct extent_state *cached;
struct extent_state *prealloc = NULL;
struct rb_node *node;
+ bool wake;
+ bool delete;
u64 last_end;
int err;
int clear = 0;
+ if (!extra_opts)
+ extra_opts = &default_opts;
+ changeset = extra_opts->changeset;
+ wake = extra_opts->wake;
+ delete = extra_opts->delete;
+
btrfs_debug_check_extent_io_range(tree, start, end);
trace_btrfs_clear_extent_bit(tree, start, end - start + 1, bits);
@@ -1445,21 +1457,30 @@ int clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits, int wake, int delete,
struct extent_state **cached)
{
- return __clear_extent_bit(tree, start, end, bits, wake, delete,
- cached, GFP_NOFS, NULL);
+ struct extent_io_extra_options extra_opts = {
+ .wake = wake,
+ .delete = delete,
+ };
+
+ return __clear_extent_bit(tree, start, end, bits,
+ cached, GFP_NOFS, &extra_opts);
}
int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits, struct extent_changeset *changeset)
{
+ struct extent_io_extra_options extra_opts = {
+ .changeset = changeset,
+ };
+
/*
* Don't support EXTENT_LOCKED case, same reason as
* set_record_extent_bits().
*/
BUG_ON(bits & EXTENT_LOCKED);
- return __clear_extent_bit(tree, start, end, bits, 0, 0, NULL, GFP_NOFS,
- changeset);
+ return __clear_extent_bit(tree, start, end, bits, NULL, GFP_NOFS,
+ &extra_opts);
}
/*
@@ -4479,7 +4500,7 @@ static int try_release_extent_state(struct extent_io_tree *tree,
*/
ret = __clear_extent_bit(tree, start, end,
~(EXTENT_LOCKED | EXTENT_NODATASUM),
- 0, 0, NULL, mask, NULL);
+ NULL, mask, NULL);
/* if clear_extent_bit failed for enomem reasons,
* we can't allow the release to continue.
@@ -380,7 +380,7 @@ static void extent_map_device_clear_bits(struct extent_map *em, unsigned bits)
__clear_extent_bit(&device->alloc_state, stripe->physical,
stripe->physical + stripe_size - 1, bits,
- 0, 0, NULL, GFP_NOWAIT, NULL);
+ NULL, GFP_NOWAIT, NULL);
}
}
The following parameters are less commonly used for __clear_extent_bit(): - wake To wake up the waiters - delete For cleanup cases, to remove the extent state regardless of its state - changeset Only utilized for qgroup Sink them into extent_io_extra_options structure. For most callers who don't care these options, we obviously sink some parameters, without any impact. For callers who care these options, we slightly increase the stack usage, as the extent_io_extra options has extra members only for __set_extent_bits(). Signed-off-by: Qu Wenruo <wqu@suse.com> --- fs/btrfs/extent-io-tree.h | 30 +++++++++++++++++++------- fs/btrfs/extent_io.c | 45 ++++++++++++++++++++++++++++----------- fs/btrfs/extent_map.c | 2 +- 3 files changed, 56 insertions(+), 21 deletions(-)