From 6a306a3cfae03f3443fee5c9c304bceba05cf51a Mon Sep 17 00:00:00 2001
From: Jesper Dangaard Brouer <brouer@redhat.com>
Date: Wed, 27 Mar 2013 05:55:25 +0000
Subject: [PATCH] --- yaml --- r: 368735 b: refs/heads/master c:
 68399ac37e571c2d695ea3b08aa82235874b5158 h: refs/heads/master i:   368733:
 0f246bb133faf233b2fbdd1947e7e5b5819d15e7   368731:
 cda65cea4e3d8caa81ac07fe339139f31a6c6c05   368727:
 e1c6f846a4868dd841a0a904a6d8260ee51c1e2e   368719:
 ee4600f80f4fceb0cb7d3af3c2e378f03212779d   368703:
 14eb27505d97629eedf8ab1cbb8b6fdfbee7c8cb v: v3

---
 [refs]                         | 2 +-
 trunk/net/ipv4/inet_fragment.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 047f9cab85dc..4797d1c9bfb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 167bfa71844a7a7415da0fa8c75e672f3bd438c8
+refs/heads/master: 68399ac37e571c2d695ea3b08aa82235874b5158
diff --git a/trunk/net/ipv4/inet_fragment.c b/trunk/net/ipv4/inet_fragment.c
index 2bff045bec60..8ba548a8efce 100644
--- a/trunk/net/ipv4/inet_fragment.c
+++ b/trunk/net/ipv4/inet_fragment.c
@@ -204,6 +204,9 @@ int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f, bool force)
 		q = list_first_entry(&nf->lru_list,
 				struct inet_frag_queue, lru_list);
 		atomic_inc(&q->refcnt);
+		/* Remove q from list to avoid several CPUs grabbing it */
+		list_del_init(&q->lru_list);
+
 		spin_unlock(&nf->lru_lock);
 
 		spin_lock(&q->lock);