Btrfs: fix list delete warning when removing ordered root from the list

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=931aa87791af46640a46b11fa503a119e36943ec
Commit:     931aa87791af46640a46b11fa503a119e36943ec
Parent:     56d140f5f61d3547dcc194de9cd5193b957b8016
Author:     Miao Xie <miaox at cn.fujitsu.com>
AuthorDate: Thu Nov 14 17:33:21 2013 +0800
Committer:  Chris Mason <chris.mason at fusionio.com>
CommitDate: Wed Nov 20 20:44:46 2013 -0500

    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 at cn.fujitsu.com>
    Signed-off-by: Josef Bacik <jbacik at fusionio.com>
    Signed-off-by: Chris Mason <chris.mason at fusionio.com>
---
 fs/btrfs/ordered-data.c | 1 +
 1 file changed, 1 insertion(+)

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);
 }