From b6ad4bfdde2f4f69716213223b8ad21593a73451 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 4 Nov 2010 01:21:39 +0000 Subject: [PATCH] --- yaml --- r: 221639 b: refs/heads/master c: 1f1b9c9990205759aae31b7734b0ede41a867f32 h: refs/heads/master i: 221637: aa7c39ed25f8dcafda0ddef39d014657faaaa851 221635: 2a4b105357f074d44720dfabaa2ba1a02c069a7c 221631: 19b12beb28aea10e01468d09634a86e5cb72e9b0 v: v3 --- [refs] | 2 +- trunk/net/ipv4/fib_lookup.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b67f94c354fc..4bdc4e8c7d6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cccbe5ef85284621d19e5b2b1c61cc0506bc9dee +refs/heads/master: 1f1b9c9990205759aae31b7734b0ede41a867f32 diff --git a/trunk/net/ipv4/fib_lookup.h b/trunk/net/ipv4/fib_lookup.h index a29edf2219c8..c079cc0ec651 100644 --- a/trunk/net/ipv4/fib_lookup.h +++ b/trunk/net/ipv4/fib_lookup.h @@ -47,11 +47,8 @@ extern int fib_detect_death(struct fib_info *fi, int order, static inline void fib_result_assign(struct fib_result *res, struct fib_info *fi) { - if (res->fi != NULL) - fib_info_put(res->fi); + /* we used to play games with refcounts, but we now use RCU */ res->fi = fi; - if (fi != NULL) - atomic_inc(&fi->fib_clntref); } #endif /* _FIB_LOOKUP_H */