]> git.hungrycats.org Git - linux/commitdiff
Btrfs: fix hang when failing to submit bio of directIO
authorLiu Bo <bo.li.liu@oracle.com>
Wed, 17 Jun 2015 08:59:57 +0000 (16:59 +0800)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Sat, 4 Jul 2015 02:00:19 +0000 (22:00 -0400)
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: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Tested-by: Filipe Manana <fdmanana@suse.com>
(cherry picked from commit 70466207b172c10c72f22bf9e233b898611f497c)

fs/btrfs/inode.c

index a21ad34de67179069a19eccd9635dd48ee943e77..e92657e21e7b7fcac77c98cf6d063408d2f9d138 100644 (file)
@@ -7872,8 +7872,6 @@ static void btrfs_endio_direct_write(struct bio *bio, int err)
        struct bio *dio_bio;
        int ret;
 
-       if (err)
-               goto out_done;
 again:
        ret = btrfs_dec_test_first_ordered_pending(inode, &ordered,
                                                   &ordered_offset,
@@ -7896,7 +7894,6 @@ out_test:
                ordered = NULL;
                goto again;
        }
-out_done:
        dio_bio = dip->dio_bio;
 
        kfree(dip);