Btrfs: add missing end_page_writeback on submit_extent_page failure
authorFilipe Manana <fdmanana@suse.com>
Mon, 22 Sep 2014 16:41:04 +0000 (17:41 +0100)
committerChris Mason <clm@fb.com>
Fri, 3 Oct 2014 23:14:58 +0000 (16:14 -0700)
If submit_extent_page() fails in write_one_eb(), we end up with the current
page not marked dirty anymore, unlocked and marked for writeback. But we never
end up calling end_page_writeback() against the page, which will make calls to
filemap_fdatawait_range (e.g. at transaction commit time) hang forever waiting
for the writeback bit to be cleared from the page.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/extent_io.c

index 78229007f99e9304b9589062b237957a27b8a008..828aded0f8aa336e4bec0cf0a169a08f3d49356c 100644 (file)
@@ -3663,6 +3663,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,
                if (ret) {
                        set_bit(EXTENT_BUFFER_IOERR, &eb->bflags);
                        SetPageError(p);
+                       end_page_writeback(p);
                        if (atomic_sub_and_test(num_pages - i, &eb->io_pages))
                                end_extent_buffer_writeback(eb);
                        ret = -EIO;