From 97259f4ea999c5deb8b349619e0546f40bd8ea91 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 9 Sep 2009 16:32:54 +1000 Subject: [PATCH] --- yaml --- r: 164651 b: refs/heads/master c: 67e7328f1577230ef3a1430c1a7e5c07978c6e51 h: refs/heads/master i: 164649: 56efc090f167aa5b8b39d395adff673b4c7aaa10 164647: b4547b3f383bd1f40519a84baf2784a972c7f411 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/cache.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3f220cce439c..bea76b43def5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0826574ddc0df486ecfc2d655e08904c6513209 +refs/heads/master: 67e7328f1577230ef3a1430c1a7e5c07978c6e51 diff --git a/trunk/net/sunrpc/cache.c b/trunk/net/sunrpc/cache.c index f2895d0a5f81..4a32a30a03eb 100644 --- a/trunk/net/sunrpc/cache.c +++ b/trunk/net/sunrpc/cache.c @@ -529,8 +529,8 @@ static int cache_defer_req(struct cache_req *req, struct cache_head *item) if (++cache_defer_cnt > DFR_MAX) { dreq = list_entry(cache_defer_list.prev, struct cache_deferred_req, recent); - list_del(&dreq->recent); - list_del(&dreq->hash); + list_del_init(&dreq->recent); + list_del_init(&dreq->hash); cache_defer_cnt--; } spin_unlock(&cache_defer_lock); @@ -564,7 +564,7 @@ static void cache_revisit_request(struct cache_head *item) dreq = list_entry(lp, struct cache_deferred_req, hash); lp = lp->next; if (dreq->item == item) { - list_del(&dreq->hash); + list_del_init(&dreq->hash); list_move(&dreq->recent, &pending); cache_defer_cnt--; } @@ -590,7 +590,7 @@ void cache_clean_deferred(void *owner) list_for_each_entry_safe(dreq, tmp, &cache_defer_list, recent) { if (dreq->owner == owner) { - list_del(&dreq->hash); + list_del_init(&dreq->hash); list_move(&dreq->recent, &pending); cache_defer_cnt--; }