diff options
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/inet_fragment.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 2bff045bec6..1206ca64b0e 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c @@ -124,7 +124,6 @@ static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f)  {  	write_lock(&f->lock);  	hlist_del(&fq->list); -	fq->net->nqueues--;  	write_unlock(&f->lock);  	inet_frag_lru_del(fq);  } @@ -204,6 +203,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); @@ -257,7 +259,6 @@ static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf,  	atomic_inc(&qp->refcnt);  	hlist_add_head(&qp->list, &f->hash[hash]); -	nf->nqueues++;  	write_unlock(&f->lock);  	inet_frag_lru_add(nf, qp);  	return qp;  |