Skip to content

Commit

Permalink
btrfs: extent_io: Handle errors better in btree_write_cache_pages()
Browse files Browse the repository at this point in the history
In btree_write_cache_pages(), we can only get @ret <= 0.
Add an ASSERT() for it just in case.

Then instead of submitting the write bio even we got some error, check
the return value first.
If we have already hit some error, just clean up the corrupted or
half-baked bio, and return error.

If there is no error so far, then call flush_write_bio() and return the
result.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Qu Wenruo authored and David Sterba committed Apr 29, 2019
1 parent 3065976 commit 2b952ee
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions fs/btrfs/extent_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -3748,7 +3748,6 @@ int btree_write_cache_pages(struct address_space *mapping,
.sync_io = wbc->sync_mode == WB_SYNC_ALL,
};
int ret = 0;
int flush_ret;
int done = 0;
int nr_to_write_done = 0;
struct pagevec pvec;
Expand Down Expand Up @@ -3848,8 +3847,12 @@ int btree_write_cache_pages(struct address_space *mapping,
index = 0;
goto retry;
}
flush_ret = flush_write_bio(&epd);
BUG_ON(flush_ret < 0);
ASSERT(ret <= 0);
if (ret < 0) {
end_write_bio(&epd, ret);
return ret;
}
ret = flush_write_bio(&epd);
return ret;
}

Expand Down

0 comments on commit 2b952ee

Please sign in to comment.