aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-09-29 15:11:56 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-09-29 15:16:25 -0400
commitaa510da5bfe1dfe263215fd0e05dac96e738a782 (patch)
tree23653cea38532e688f593e36295c312158558a79
parenta00dd6c03dd97a777c291a8af8682be4b5fadf8d (diff)
downloadmrst-s0i3-test-aa510da5bfe1dfe263215fd0e05dac96e738a782.tar.gz
mrst-s0i3-test-aa510da5bfe1dfe263215fd0e05dac96e738a782.tar.xz
mrst-s0i3-test-aa510da5bfe1dfe263215fd0e05dac96e738a782.zip
NFS: We must use list_for_each_entry_safe in nfs_access_cache_shrinker
We may end up removing the current entry from nfs_access_lru_list. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 86f1d41c607..fe549f5ef20 100644
--- a/fs/nfs/dir.c
+++ b/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)