diff options
| author | Miao Xie <miaox@cn.fujitsu.com> | 2013-11-14 17:33:21 +0800 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-11-20 20:44:46 -0500 |
| commit | 931aa87791af46640a46b11fa503a119e36943ec (patch) | |
| tree | 3ed597a39b892e6c1034f0e1e6777e4c2660b4e2 | |
| parent | 56d140f5f61d3547dcc194de9cd5193b957b8016 (diff) | |
| download | linux-stable-931aa87791af46640a46b11fa503a119e36943ec.tar.gz linux-stable-931aa87791af46640a46b11fa503a119e36943ec.tar.bz2 linux-stable-931aa87791af46640a46b11fa503a119e36943ec.zip | |
Btrfs: fix list delete warning when removing ordered root from the list
Commit b02441999efcc6152b87cd58e7970bb7843f76cf "Btrfs: don't wait for
the completion of all the ordered extents" introduced a bug that broke
the ordered root list:
WARNING: CPU: 1 PID: 7119 at lib/list_debug.c:59 __list_del_entry+0x5a/0x98()
It is because we forgot to return the roots in the splice list to the
ordered list of the fs. Fix it.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
| -rw-r--r-- | fs/btrfs/ordered-data.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index c37124bccf17..69582d5b69d1 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c @@ -638,6 +638,7 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr) WARN_ON(nr < 0); } } + list_splice_tail(&splice, &fs_info->ordered_roots); spin_unlock(&fs_info->ordered_root_lock); } |