OSDN Git Service

btrfs: extent_io: Handle errors better in extent_writepages()
authorQu Wenruo <wqu@suse.com>
Wed, 20 Mar 2019 06:27:48 +0000 (14:27 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 29 Apr 2019 17:02:24 +0000 (19:02 +0200)
We can only get <=0 from extent_write_cache_pages, add an ASSERT() for
it just in case.

Then instead of submitting the write bio even if 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>
fs/btrfs/extent_io.c

index 38dcac0..e304d5f 100644 (file)
@@ -4104,7 +4104,6 @@ int extent_writepages(struct address_space *mapping,
                      struct writeback_control *wbc)
 {
        int ret = 0;
-       int flush_ret;
        struct extent_page_data epd = {
                .bio = NULL,
                .tree = &BTRFS_I(mapping->host)->io_tree,
@@ -4113,8 +4112,12 @@ int extent_writepages(struct address_space *mapping,
        };
 
        ret = extent_write_cache_pages(mapping, wbc, &epd);
-       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;
 }