1 files changed, 4 insertions, 12 deletions

diff --git a/fs/dcache.c b/fs/dcache.c
index a15a2e1f5520..7376b61269fb 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -337,12 +337,10 @@ struct dentry * d_find_alias(struct inode *inode)
  */
 void d_prune_aliases(struct inode *inode)
 {
-        struct list_head *tmp, *head = &inode->i_dentry;
+        struct dentry *dentry;
 restart:
         spin_lock(&dcache_lock);
-        tmp = head;
-        while ((tmp = tmp->next) != head) {
-                struct dentry *dentry = list_entry(tmp, struct dentry, d_alias);
+        list_for_each_entry(dentry, &inode->i_dentry, d_alias) {
                 spin_lock(&dentry->d_lock);
                 if (!atomic_read(&dentry->d_count)) {
                         __dget_locked(dentry);
@@ -463,10 +461,7 @@ void shrink_dcache_sb(struct super_block * sb)
          * superblock to the most recent end of the unused list.
          */
         spin_lock(&dcache_lock);
-        next = dentry_unused.next;
-        while (next != &dentry_unused) {
-                tmp = next;
-                next = tmp->next;
+        list_for_each_safe(tmp, next, &dentry_unused) {
                 dentry = list_entry(tmp, struct dentry, d_lru);
                 if (dentry->d_sb != sb)
                         continue;
@@ -478,10 +473,7 @@ void shrink_dcache_sb(struct super_block * sb)
          * Pass two ... free the dentries for this superblock.
          */
 repeat:
-        next = dentry_unused.next;
-        while (next != &dentry_unused) {
-                tmp = next;
-                next = tmp->next;
+        list_for_each_safe(tmp, next, &dentry_unused) {
                 dentry = list_entry(tmp, struct dentry, d_lru);
                 if (dentry->d_sb != sb)
                         continue;