diff options
author | Liu Bo | 2018-01-25 12:02:50 -0600 |
---|---|---|
committer | Greg Kroah-Hartman | 2018-02-22 08:45:00 -0600 |
commit | efba91a4c3f465e1b7f10b2454d6406eb217a17e (patch) | |
tree | 4e14d5312356ecbdcb1e80b3b3f0e077383035a4 | |
parent | 4f62fb888d96ddc236aa11015f95d0afe4f3ba8b (diff) | |
download | kernel-omap-efba91a4c3f465e1b7f10b2454d6406eb217a17e.tar.gz kernel-omap-efba91a4c3f465e1b7f10b2454d6406eb217a17e.tar.xz kernel-omap-efba91a4c3f465e1b7f10b2454d6406eb217a17e.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>
-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 86d209fc4992..81b5a461d94e 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -1292,8 +1292,11 @@ next_slot: | |||
1292 | leaf = path->nodes[0]; | 1292 | leaf = path->nodes[0]; |
1293 | if (path->slots[0] >= btrfs_header_nritems(leaf)) { | 1293 | if (path->slots[0] >= btrfs_header_nritems(leaf)) { |
1294 | ret = btrfs_next_leaf(root, path); | 1294 | ret = btrfs_next_leaf(root, path); |
1295 | if (ret < 0) | 1295 | if (ret < 0) { |
1296 | if (cow_start != (u64)-1) | ||
1297 | cur_offset = cow_start; | ||
1296 | goto error; | 1298 | goto error; |
1299 | } | ||
1297 | if (ret > 0) | 1300 | if (ret > 0) |
1298 | break; | 1301 | break; |
1299 | leaf = path->nodes[0]; | 1302 | leaf = path->nodes[0]; |