diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2018-01-25 11:02:50 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-25 11:01:16 +0100 |
| commit | 8fae1c38b61adeca793920d879862386a0c3255d (patch) | |
| tree | 064d52ebf2f592c48311efc2d49d43044964effd /fs | |
| parent | 5b7d39a5daf92f56625fdda468d708a7036b9995 (diff) | |
| download | linux-stable-8fae1c38b61adeca793920d879862386a0c3255d.tar.gz linux-stable-8fae1c38b61adeca793920d879862386a0c3255d.tar.bz2 linux-stable-8fae1c38b61adeca793920d879862386a0c3255d.zip | |
Btrfs: fix deadlock in run_delalloc_nocow
commit e89166990f11c3f21e1649d760dd35f9e410321c upstream.
@cur_offset is not set back to what it should be (@cow_start) if
btrfs_next_leaf() returns something wrong, and the range [cow_start,
cur_offset) remains locked forever.
cc: <stable@vger.kernel.org>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 577a47a50da7..eecdb1dafd10 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1256,8 +1256,11 @@ next_slot: leaf = path->nodes[0]; if (path->slots[0] >= btrfs_header_nritems(leaf)) { ret = btrfs_next_leaf(root, path); - if (ret < 0) + if (ret < 0) { + if (cow_start != (u64)-1) + cur_offset = cow_start; goto error; + } if (ret > 0) break; leaf = path->nodes[0]; |