From 33adcf075aff373c56ff14f3b038ee734ce46c1e Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 29 Sep 2010 15:11:56 -0400 Subject: [PATCH] --- yaml --- r: 217059 b: refs/heads/master c: aa510da5bfe1dfe263215fd0e05dac96e738a782 h: refs/heads/master i: 217057: 6caa63026f6a3373ddda33c854c4edaf62984ee3 217055: ac60699618160dba7dd53bdc34ae423884ef9150 v: v3 --- [refs] | 2 +- trunk/fs/nfs/dir.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c55ceab8e0f6..4db93552205a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a00dd6c03dd97a777c291a8af8682be4b5fadf8d +refs/heads/master: aa510da5bfe1dfe263215fd0e05dac96e738a782 diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c index 86f1d41c6078..fe549f5ef20f 100644 --- a/trunk/fs/nfs/dir.c +++ b/trunk/fs/nfs/dir.c @@ -1788,14 +1788,14 @@ static void nfs_access_free_list(struct list_head *head) int nfs_access_cache_shrinker(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask) { LIST_HEAD(head); - struct nfs_inode *nfsi; + struct nfs_inode *nfsi, *next; struct nfs_access_entry *cache; if ((gfp_mask & GFP_KERNEL) != GFP_KERNEL) return (nr_to_scan == 0) ? 0 : -1; spin_lock(&nfs_access_lru_lock); - list_for_each_entry(nfsi, &nfs_access_lru_list, access_cache_inode_lru) { + list_for_each_entry_safe(nfsi, next, &nfs_access_lru_list, access_cache_inode_lru) { struct inode *inode; if (nr_to_scan-- == 0)