diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2018-01-25 11:02:50 -0700 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-03-04 10:28:23 -0500 |
| commit | 9ba95b32566a8eac13233bfb4d116a857b9e5790 (patch) | |
| tree | 6ae427c8c3b70c1f8ff7f3d7f95a1d9c67fea0ee /fs | |
| parent | 85f5fd75929e65aa4f1a13ae666b578369a5cedc (diff) | |
Btrfs: fix deadlock in run_delalloc_nocow
[ Upstream commit e89166990f11c3f21e1649d760dd35f9e410321c ]
@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: Sasha Levin <alexander.levin@microsoft.com>
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 1423231c7e49..884e90e9622a 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1282,8 +1282,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]; |