Commit 931aa877 authored Nov 14, 2013 by Miao Xie Committed by Chris Mason Nov 20, 2013

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



Commit b0244199 "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>

parent 56d140f5

fs/btrfs/ordered-data.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -638,6 +638,7 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr)
	WARN_ON(nr < 0);		WARN_ON(nr < 0);
	}		}
	}		}
			list_splice_tail(&splice, &fs_info->ordered_roots);
	spin_unlock(&fs_info->ordered_root_lock);		spin_unlock(&fs_info->ordered_root_lock);
	}		}