btrfs: lift errors from add_extent_changeset to the callers
authorDavid Sterba <dsterba@suse.com>
Thu, 1 Mar 2018 16:56:34 +0000 (17:56 +0100)
committerDavid Sterba <dsterba@suse.com>
Sat, 31 Mar 2018 00:03:25 +0000 (02:03 +0200)
The missing error handling in add_extent_changeset was hidden, so make
it at least visible in the callers.

Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent_io.c

index f27bad003f8e218454044f60914f70c4cfeb1bff..47a8fe9d22e890bddd2d3df7bf9abb027db4647a 100644 (file)
@@ -119,23 +119,22 @@ struct extent_page_data {
        unsigned int sync_io:1;
 };
 
        unsigned int sync_io:1;
 };
 
-static void add_extent_changeset(struct extent_state *state, unsigned bits,
+static int add_extent_changeset(struct extent_state *state, unsigned bits,
                                 struct extent_changeset *changeset,
                                 int set)
 {
        int ret;
 
        if (!changeset)
                                 struct extent_changeset *changeset,
                                 int set)
 {
        int ret;
 
        if (!changeset)
-               return;
+               return 0;
        if (set && (state->state & bits) == bits)
        if (set && (state->state & bits) == bits)
-               return;
+               return 0;
        if (!set && (state->state & bits) == 0)
        if (!set && (state->state & bits) == 0)
-               return;
+               return 0;
        changeset->bytes_changed += state->end - state->start + 1;
        ret = ulist_add(&changeset->range_changed, state->start, state->end,
                        GFP_ATOMIC);
        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);
+       return ret;
 }
 
 static void flush_write_bio(struct extent_page_data *epd);
 }
 
 static void flush_write_bio(struct extent_page_data *epd);
@@ -527,6 +526,7 @@ static struct extent_state *clear_state_bit(struct extent_io_tree *tree,
 {
        struct extent_state *next;
        unsigned bits_to_clear = *bits & ~EXTENT_CTLBITS;
 {
        struct extent_state *next;
        unsigned bits_to_clear = *bits & ~EXTENT_CTLBITS;
+       int ret;
 
        if ((bits_to_clear & EXTENT_DIRTY) && (state->state & EXTENT_DIRTY)) {
                u64 range = state->end - state->start + 1;
 
        if ((bits_to_clear & EXTENT_DIRTY) && (state->state & EXTENT_DIRTY)) {
                u64 range = state->end - state->start + 1;
@@ -534,7 +534,8 @@ static struct extent_state *clear_state_bit(struct extent_io_tree *tree,
                tree->dirty_bytes -= range;
        }
        clear_state_cb(tree, state, bits);
                tree->dirty_bytes -= range;
        }
        clear_state_cb(tree, state, bits);
-       add_extent_changeset(state, bits_to_clear, changeset, 0);
+       ret = add_extent_changeset(state, bits_to_clear, changeset, 0);
+       BUG_ON(ret < 0);
        state->state &= ~bits_to_clear;
        if (wake)
                wake_up(&state->wq);
        state->state &= ~bits_to_clear;
        if (wake)
                wake_up(&state->wq);
@@ -805,13 +806,15 @@ static void set_state_bits(struct extent_io_tree *tree,
                           unsigned *bits, struct extent_changeset *changeset)
 {
        unsigned bits_to_set = *bits & ~EXTENT_CTLBITS;
                           unsigned *bits, struct extent_changeset *changeset)
 {
        unsigned bits_to_set = *bits & ~EXTENT_CTLBITS;
+       int ret;
 
        set_state_cb(tree, state, bits);
        if ((bits_to_set & EXTENT_DIRTY) && !(state->state & EXTENT_DIRTY)) {
                u64 range = state->end - state->start + 1;
                tree->dirty_bytes += range;
        }
 
        set_state_cb(tree, state, bits);
        if ((bits_to_set & EXTENT_DIRTY) && !(state->state & EXTENT_DIRTY)) {
                u64 range = state->end - state->start + 1;
                tree->dirty_bytes += range;
        }
-       add_extent_changeset(state, bits_to_set, changeset, 1);
+       ret = add_extent_changeset(state, bits_to_set, changeset, 1);
+       BUG_ON(ret < 0);
        state->state |= bits_to_set;
 }
 
        state->state |= bits_to_set;
 }