diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2015-06-17 16:59:57 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-07-01 17:17:20 -0700 |
| commit | ad9ee2053f3f2babebc09ebc4970daa66c56c7ee (patch) | |
| tree | 07c9c002e3b0af7a496ff93ad7d52773c6361244 /fs/btrfs | |
| parent | 9c6429d96daec64f6b5b10a1c6b02c7264541ea1 (diff) | |
| download | linux-stable-ad9ee2053f3f2babebc09ebc4970daa66c56c7ee.tar.gz linux-stable-ad9ee2053f3f2babebc09ebc4970daa66c56c7ee.tar.bz2 linux-stable-ad9ee2053f3f2babebc09ebc4970daa66c56c7ee.zip | |
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: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Tested-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 53afda0ef4e3..0b9fb81ccf8a 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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); |