Merge pull request torvalds#107 from kmihelich/c1_aufs

mdrjr · mdrjr · commit a2838e62905d · 2015-06-17T09:26:29.000-03:00
Additional AUFS fixes for odroidc-3.10.y
diff --git a/fs/aufs/debug.c b/fs/aufs/debug.c
@@ -156,7 +156,7 @@ void au_dpri_dalias(struct inode *inode)
 	struct dentry *d;
 
 	spin_lock(&inode->i_lock);
-	hlist_for_each_entry(d, &inode->i_dentry, d_alias)
+	hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias)
 		au_dpri_dentry(d);
 	spin_unlock(&inode->i_lock);
 }
diff --git a/fs/aufs/hnotify.c b/fs/aufs/hnotify.c
@@ -198,7 +198,7 @@ static int hn_gen_by_inode(char *name, unsigned int nlen, struct inode *inode,
 		AuDebugOn(!name);
 		au_iigen_dec(inode);
 		spin_lock(&inode->i_lock);
-		hlist_for_each_entry(d, &inode->i_dentry, d_alias) {
+		hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias) {
 			spin_lock(&d->d_lock);
 			dname = &d->d_name;
 			if (dname->len != nlen

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ void au_dpri_dalias(struct inode *inode)`
`156`	`156`	`struct dentry *d;`
`157`	`157`
`158`	`158`	`spin_lock(&inode->i_lock);`
`159`		`- hlist_for_each_entry(d, &inode->i_dentry, d_alias)`
	`159`	`+ hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias)`
`160`	`160`	`au_dpri_dentry(d);`
`161`	`161`	`spin_unlock(&inode->i_lock);`
`162`	`162`	`}`