diff options
| author | Wang Shilong <wangsl.fnst@cn.fujitsu.com> | 2013-12-11 19:29:52 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2013-12-12 07:12:51 -0800 |
| commit | 467bb1d27c0b783b73e6349304c0d90b5b4f431b (patch) | |
| tree | 0c425a7f15c52b005cf3265af284cec5597d0a78 /fs | |
| parent | 6646374863508e24da7c7d21527f8dadc8687ff9 (diff) | |
| download | op-kernel-dev-467bb1d27c0b783b73e6349304c0d90b5b4f431b.zip op-kernel-dev-467bb1d27c0b783b73e6349304c0d90b5b4f431b.tar.gz | |
Btrfs: make sure we cleanup all reloc roots if error happens
I hit an oops when merging reloc roots fails, the reason is that
new reloc roots may be added and we should make sure we cleanup
all reloc roots.
Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/relocation.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 0a3f0256..429c73c 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -2409,6 +2409,13 @@ out: btrfs_std_error(root->fs_info, ret); if (!list_empty(&reloc_roots)) free_reloc_roots(&reloc_roots); + + /* new reloc root may be added */ + mutex_lock(&root->fs_info->reloc_mutex); + list_splice_init(&rc->reloc_roots, &reloc_roots); + mutex_unlock(&root->fs_info->reloc_mutex); + if (!list_empty(&reloc_roots)) + free_reloc_roots(&reloc_roots); } BUG_ON(!RB_EMPTY_ROOT(&rc->reloc_root_tree.rb_root)); |
