From: Miao Xie Date: Thu, 14 Nov 2013 09:33:21 +0000 (+0800) Subject: Btrfs: fix list delete warning when removing ordered root from the list X-Git-Tag: v3.13-rc3~10^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=931aa87791af46640a46b11fa503a119e36943ec;p=kernel%2Fkernel-generic.git 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 Signed-off-by: Josef Bacik Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index c37124b..69582d5 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); }