diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2016-12-20 13:28:27 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:26:44 +0000 |
| commit | 884285c06ee71d122aa49309bfca71b70ff19ea3 (patch) | |
| tree | 5e5dfe21257a520870837299ebadc4931a71b48e /fs | |
| parent | 2eb579839657b0872c575d3d79ffc9add27d99c1 (diff) | |
| download | linux-stable-884285c06ee71d122aa49309bfca71b70ff19ea3.tar.gz linux-stable-884285c06ee71d122aa49309bfca71b70ff19ea3.tar.bz2 linux-stable-884285c06ee71d122aa49309bfca71b70ff19ea3.zip | |
btrfs: fix error handling when run_delayed_extent_op fails
commit aa7c8da35d1905d80e840d075f07d26ec90144b5 upstream.
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>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -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 482ebbcd1d72..f3f8706e5748 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -2479,7 +2479,10 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, */ if (must_insert_reserved) locked_ref->must_insert_reserved = 1; + spin_lock(&delayed_refs->lock); locked_ref->processing = 0; + delayed_refs->num_heads_ready++; + spin_unlock(&delayed_refs->lock); btrfs_debug(fs_info, "run_delayed_extent_op returned %d", ret); btrfs_delayed_ref_unlock(locked_ref); return ret; |