diff options
| author | Zhaolei <zhaolei@cn.fujitsu.com> | 2015-08-06 21:56:58 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-08-09 07:07:14 -0700 |
| commit | 93314e3b64fd2e77237fdba7cfcc0d38dcd05579 (patch) | |
| tree | 16a545b8fb3679186e8092414e6c4693ceb795b6 /fs/btrfs | |
| parent | 147d256e0980e31505d25d721be979d6a8d2148c (diff) | |
| download | op-kernel-dev-93314e3b64fd2e77237fdba7cfcc0d38dcd05579.zip op-kernel-dev-93314e3b64fd2e77237fdba7cfcc0d38dcd05579.tar.gz | |
btrfs: abort transaction on btrfs_reloc_cow_block()
When btrfs_reloc_cow_block() failed in __btrfs_cow_block(), current
code just return a err-value to caller, but leave new_created extent
buffer exist and locked.
Then subsequent code (in relocate) try to lock above eb again,
and caused deadlock without any dmesg.
(eb lock use wait_event(), so no lockdep message)
It is hard to do recover work in __btrfs_cow_block() at this error
point, but we can abort transaction to avoid deadlock and operate on
unstable state.a
It also helps developer to find wrong place quickly.
(better than a frozen fs without any dmesg before patch)
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/ctree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 54114b4..5f745ea 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -1159,8 +1159,10 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, if (test_bit(BTRFS_ROOT_REF_COWS, &root->state)) { ret = btrfs_reloc_cow_block(trans, root, buf, cow); - if (ret) + if (ret) { + btrfs_abort_transaction(trans, root, ret); return ret; + } } if (buf == root->node) { |
