Commit ad9ee205 authored by Liu Bo's avatar Liu Bo Committed by Chris Mason

Btrfs: fix hang when failing to submit bio of directIO

The hang is uncoverd by generic/019.

btrfs_endio_direct_write() skips the "finish_ordered_fn" part when it hits
an error, thus those added ordered extents will never get processed, which
block processes that waiting for them via btrfs_start_ordered_extent().

This fixes the above, and meanwhile finish_ordered_fn will do the space
accounting work.
Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Tested-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 9c6429d9
...@@ -7872,8 +7872,6 @@ static void btrfs_endio_direct_write(struct bio *bio, int err) ...@@ -7872,8 +7872,6 @@ static void btrfs_endio_direct_write(struct bio *bio, int err)
struct bio *dio_bio; struct bio *dio_bio;
int ret; int ret;
if (err)
goto out_done;
again: again:
ret = btrfs_dec_test_first_ordered_pending(inode, &ordered, ret = btrfs_dec_test_first_ordered_pending(inode, &ordered,
&ordered_offset, &ordered_offset,
...@@ -7896,7 +7894,6 @@ static void btrfs_endio_direct_write(struct bio *bio, int err) ...@@ -7896,7 +7894,6 @@ static void btrfs_endio_direct_write(struct bio *bio, int err)
ordered = NULL; ordered = NULL;
goto again; goto again;
} }
out_done:
dio_bio = dip->dio_bio; dio_bio = dip->dio_bio;
kfree(dip); kfree(dip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment