diff options
author | Jeff Mahoney <jeffm@suse.com> | 2016-12-20 13:28:27 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-01-03 09:14:08 -0500 |
commit | aa7c8da35d1905d80e840d075f07d26ec90144b5 (patch) | |
tree | d98c4cc3d44debbe6b75c9084b71f86a365c8669 | |
parent | 73ba39ab9307340dc98ec3622891314bbc09cc2e (diff) |
btrfs: fix error handling when run_delayed_extent_op fails
In __btrfs_run_delayed_refs, the error path when run_delayed_extent_op
fails sets locked_ref->processing = 0 but doesn't re-increment
delayed_refs->num_heads_ready. As a result, we end up triggering
the WARN_ON in btrfs_select_ref_head.
Fixes: d7df2c796d7 (Btrfs: attach delayed ref updates to delayed ref heads)
Reported-by: Jon Nelson <jnelson-suse@jamponi.net>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/extent-tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index e97302f437a1..5366e50c84c6 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -2572,7 +2572,10 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, | |||
2572 | */ | 2572 | */ |
2573 | if (must_insert_reserved) | 2573 | if (must_insert_reserved) |
2574 | locked_ref->must_insert_reserved = 1; | 2574 | locked_ref->must_insert_reserved = 1; |
2575 | spin_lock(&delayed_refs->lock); | ||
2575 | locked_ref->processing = 0; | 2576 | locked_ref->processing = 0; |
2577 | delayed_refs->num_heads_ready++; | ||
2578 | spin_unlock(&delayed_refs->lock); | ||
2576 | btrfs_debug(fs_info, | 2579 | btrfs_debug(fs_info, |
2577 | "run_delayed_extent_op returned %d", | 2580 | "run_delayed_extent_op returned %d", |
2578 | ret); | 2581 | ret); |