Skip to content

Commit

Permalink
btrfs: extent_io: Introduce new function set_record_extent_bits
Browse files Browse the repository at this point in the history 
Introduce new function set_record_extent_bits(), which will not only set
given bits, but also record how many bytes are changed, and detailed
range info.

This is quite important for later qgroup reserve framework.
The number of bytes will be used to do qgroup reserve, and detailed
range info will be used to cleanup for EQUOT case.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
  • Loading branch information
Qu Wenruo authored and Chris Mason committed Oct 22, 2015
1 parent ac46777 commit d38ed27
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 18 deletions.
71 changes: 53 additions & 18 deletions fs/btrfs/extent_io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,23 @@ struct extent_page_data {
unsigned int sync_io:1;
};

static void add_extent_changeset(struct extent_state *state, unsigned bits,
struct extent_changeset *changeset,
int set)
{
int ret;

if (!changeset)
return;
if (set && (state->state & bits) == bits)
return;
changeset->bytes_changed += state->end - state->start + 1;
ret = ulist_add(changeset->range_changed, state->start, state->end,
GFP_ATOMIC);
/* ENOMEM */
BUG_ON(ret < 0);
}

static noinline void flush_write_bio(void *data);
static inline struct btrfs_fs_info *
tree_fs_info(struct extent_io_tree *tree)
Expand Down Expand Up @@ -410,7 +427,8 @@ static void clear_state_cb(struct extent_io_tree *tree,
}

static void set_state_bits(struct extent_io_tree *tree,
struct extent_state *state, unsigned *bits);
struct extent_state *state, unsigned *bits,
struct extent_changeset *changeset);

/*
* insert an extent_state struct into the tree. 'bits' are set on the
Expand All @@ -426,7 +444,7 @@ static int insert_state(struct extent_io_tree *tree,
struct extent_state *state, u64 start, u64 end,
struct rb_node ***p,
struct rb_node **parent,
unsigned *bits)
unsigned *bits, struct extent_changeset *changeset)
{
struct rb_node *node;

Expand All @@ -436,7 +454,7 @@ static int insert_state(struct extent_io_tree *tree,
state->start = start;
state->end = end;

set_state_bits(tree, state, bits);
set_state_bits(tree, state, bits, changeset);

node = tree_insert(&tree->state, NULL, end, &state->rb_node, p, parent);
if (node) {
Expand Down Expand Up @@ -789,7 +807,7 @@ static void wait_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,

static void set_state_bits(struct extent_io_tree *tree,
struct extent_state *state,
unsigned *bits)
unsigned *bits, struct extent_changeset *changeset)
{
unsigned bits_to_set = *bits & ~EXTENT_CTLBITS;

Expand All @@ -798,6 +816,7 @@ static void set_state_bits(struct extent_io_tree *tree,
u64 range = state->end - state->start + 1;
tree->dirty_bytes += range;
}
add_extent_changeset(state, bits_to_set, changeset, 1);
state->state |= bits_to_set;
}

Expand Down Expand Up @@ -835,7 +854,7 @@ static int __must_check
__set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits, unsigned exclusive_bits,
u64 *failed_start, struct extent_state **cached_state,
gfp_t mask)
gfp_t mask, struct extent_changeset *changeset)
{
struct extent_state *state;
struct extent_state *prealloc = NULL;
Expand Down Expand Up @@ -873,7 +892,7 @@ __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
prealloc = alloc_extent_state_atomic(prealloc);
BUG_ON(!prealloc);
err = insert_state(tree, prealloc, start, end,
&p, &parent, &bits);
&p, &parent, &bits, changeset);
if (err)
extent_io_tree_panic(tree, err);

Expand All @@ -899,7 +918,7 @@ __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
goto out;
}

set_state_bits(tree, state, &bits);
set_state_bits(tree, state, &bits, changeset);
cache_state(state, cached_state);
merge_state(tree, state);
if (last_end == (u64)-1)
Expand Down Expand Up @@ -945,7 +964,7 @@ __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
if (err)
goto out;
if (state->end <= end) {
set_state_bits(tree, state, &bits);
set_state_bits(tree, state, &bits, changeset);
cache_state(state, cached_state);
merge_state(tree, state);
if (last_end == (u64)-1)
Expand Down Expand Up @@ -980,7 +999,7 @@ __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
* the later extent.
*/
err = insert_state(tree, prealloc, start, this_end,
NULL, NULL, &bits);
NULL, NULL, &bits, changeset);
if (err)
extent_io_tree_panic(tree, err);

Expand Down Expand Up @@ -1008,7 +1027,7 @@ __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
if (err)
extent_io_tree_panic(tree, err);

set_state_bits(tree, prealloc, &bits);
set_state_bits(tree, prealloc, &bits, changeset);
cache_state(prealloc, cached_state);
merge_state(tree, prealloc);
prealloc = NULL;
Expand Down Expand Up @@ -1038,7 +1057,7 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
struct extent_state **cached_state, gfp_t mask)
{
return __set_extent_bit(tree, start, end, bits, 0, failed_start,
cached_state, mask);
cached_state, mask, NULL);
}


Expand Down Expand Up @@ -1111,7 +1130,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
goto out;
}
err = insert_state(tree, prealloc, start, end,
&p, &parent, &bits);
&p, &parent, &bits, NULL);
if (err)
extent_io_tree_panic(tree, err);
cache_state(prealloc, cached_state);
Expand All @@ -1130,7 +1149,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
* Just lock what we found and keep going
*/
if (state->start == start && state->end <= end) {
set_state_bits(tree, state, &bits);
set_state_bits(tree, state, &bits, NULL);
cache_state(state, cached_state);
state = clear_state_bit(tree, state, &clear_bits, 0);
if (last_end == (u64)-1)
Expand Down Expand Up @@ -1171,7 +1190,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
if (err)
goto out;
if (state->end <= end) {
set_state_bits(tree, state, &bits);
set_state_bits(tree, state, &bits, NULL);
cache_state(state, cached_state);
state = clear_state_bit(tree, state, &clear_bits, 0);
if (last_end == (u64)-1)
Expand Down Expand Up @@ -1208,7 +1227,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
* the later extent.
*/
err = insert_state(tree, prealloc, start, this_end,
NULL, NULL, &bits);
NULL, NULL, &bits, NULL);
if (err)
extent_io_tree_panic(tree, err);
cache_state(prealloc, cached_state);
Expand All @@ -1233,7 +1252,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
if (err)
extent_io_tree_panic(tree, err);

set_state_bits(tree, prealloc, &bits);
set_state_bits(tree, prealloc, &bits, NULL);
cache_state(prealloc, cached_state);
clear_state_bit(tree, prealloc, &clear_bits, 0);
prealloc = NULL;
Expand Down Expand Up @@ -1274,6 +1293,22 @@ int set_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
NULL, mask);
}

int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits, gfp_t mask,
struct extent_changeset *changeset)
{
/*
* We don't support EXTENT_LOCKED yet, as current changeset will
* record any bits changed, so for EXTENT_LOCKED case, it will
* either fail with -EEXIST or changeset will record the whole
* range.
*/
BUG_ON(bits & EXTENT_LOCKED);

return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL, mask,
changeset);
}

int clear_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits, gfp_t mask)
{
Expand Down Expand Up @@ -1343,7 +1378,7 @@ int lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
while (1) {
err = __set_extent_bit(tree, start, end, EXTENT_LOCKED | bits,
EXTENT_LOCKED, &failed_start,
cached_state, GFP_NOFS);
cached_state, GFP_NOFS, NULL);
if (err == -EEXIST) {
wait_extent_bit(tree, failed_start, end, EXTENT_LOCKED);
start = failed_start;
Expand All @@ -1365,7 +1400,7 @@ int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end)
u64 failed_start;

err = __set_extent_bit(tree, start, end, EXTENT_LOCKED, EXTENT_LOCKED,
&failed_start, NULL, GFP_NOFS);
&failed_start, NULL, GFP_NOFS, NULL);
if (err == -EEXIST) {
if (failed_start > start)
clear_extent_bit(tree, start, failed_start - 1,
Expand Down
3 changes: 3 additions & 0 deletions fs/btrfs/extent_io.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ int clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
struct extent_state **cached, gfp_t mask);
int set_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits, gfp_t mask);
int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits, gfp_t mask,
struct extent_changeset *changeset);
int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits, u64 *failed_start,
struct extent_state **cached_state, gfp_t mask);
Expand Down

0 comments on commit d38ed27

Please sign in to comment.