From mboxrd@z Thu Jan 1 00:00:00 1970 From: domen@coderock.org Subject: [patch 3/7] list_for_each_entry in fs/dcache.c Date: Sun, 06 Mar 2005 11:37:37 +0100 Message-ID: <20050306103737.F26171F208@trashy.coderock.org> Cc: linux-fsdevel@vger.kernel.org, domen@coderock.org, janitor@sternwelten.at Received: from coderock.org ([193.77.147.115]:64937 "EHLO trashy.coderock.org") by vger.kernel.org with ESMTP id S261376AbVCFKhw (ORCPT ); Sun, 6 Mar 2005 05:37:52 -0500 To: viro@parcelfarce.linux.theplanet.co.uk Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org First 2 are list_for_each_entry (thanks maks), second 2 list_for_each_safe. Boot tested. Signed-off-by: Domen Puncer Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer --- kj-domen/fs/dcache.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff -puN fs/dcache.c~list-for-each-fs_dcache fs/dcache.c --- kj/fs/dcache.c~list-for-each-fs_dcache 2005-03-05 16:09:06.000000000 +0100 +++ kj-domen/fs/dcache.c 2005-03-05 16:09:06.000000000 +0100 @@ -334,12 +334,10 @@ struct dentry * d_find_alias(struct inod */ 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) { if (!atomic_read(&dentry->d_count)) { __dget_locked(dentry); __d_drop(dentry); @@ -457,10 +455,7 @@ void shrink_dcache_sb(struct super_block * 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; @@ -472,10 +467,7 @@ void shrink_dcache_sb(struct super_block * 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; _