diff --git a/[refs] b/[refs]
index 4cbe6e572afa..9a009c1b8acd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 049b3c10eecd0a5f3605fa3cd13f638593213ccb
+refs/heads/master: 3084ee95f08ce353ae26c18c7627c4e9786983ca
diff --git a/trunk/fs/affs/amigaffs.c b/trunk/fs/affs/amigaffs.c
index 52a6407682e6..1c7fd7928d1f 100644
--- a/trunk/fs/affs/amigaffs.c
+++ b/trunk/fs/affs/amigaffs.c
@@ -126,18 +126,13 @@ affs_fix_dcache(struct dentry *dentry, u32 entry_ino)
 {
 	struct inode *inode = dentry->d_inode;
 	void *data = dentry->d_fsdata;
-	struct list_head *head, *next;
 
 	spin_lock(&inode->i_lock);
-	head = &inode->i_dentry;
-	next = head->next;
-	while (next != head) {
-		dentry = list_entry(next, struct dentry, d_alias);
+	list_for_each_entry(dentry, &inode->i_dentry, d_alias) {
 		if (entry_ino == (u32)(long)dentry->d_fsdata) {
 			dentry->d_fsdata = data;
 			break;
 		}
-		next = next->next;
 	}
 	spin_unlock(&inode->i_lock);
 }