]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
l2tp: remove l2tp specific refcount debugging
authorGuillaume Nault <g.nault@alphalink.fr>
Tue, 31 Oct 2017 16:36:44 +0000 (17:36 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Nov 2017 01:57:24 +0000 (10:57 +0900)
With conversion to refcount_t, such manual debugging code doesn't make
sense anymore.
The tunnel part was already dropped by
54652eb12c1b ("l2tp: hold tunnel while looking up sessions in l2tp_netlink").

Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/l2tp/l2tp_core.h

index 92c90e72259c661491e594d31c060279d3c5f91d..9534e16965ccbd87a4e8245df7dc079bdb7931eb 100644 (file)
@@ -294,37 +294,17 @@ static inline void l2tp_tunnel_dec_refcount(struct l2tp_tunnel *tunnel)
 /* Session reference counts. Incremented when code obtains a reference
  * to a session.
  */
-static inline void l2tp_session_inc_refcount_1(struct l2tp_session *session)
+static inline void l2tp_session_inc_refcount(struct l2tp_session *session)
 {
        refcount_inc(&session->ref_count);
 }
 
-static inline void l2tp_session_dec_refcount_1(struct l2tp_session *session)
+static inline void l2tp_session_dec_refcount(struct l2tp_session *session)
 {
        if (refcount_dec_and_test(&session->ref_count))
                l2tp_session_free(session);
 }
 
-#ifdef L2TP_REFCNT_DEBUG
-#define l2tp_session_inc_refcount(_s)                                  \
-do {                                                                   \
-       pr_debug("l2tp_session_inc_refcount: %s:%d %s: cnt=%d\n",       \
-                __func__, __LINE__, (_s)->name,                        \
-                refcount_read(&_s->ref_count));                        \
-       l2tp_session_inc_refcount_1(_s);                                \
-} while (0)
-#define l2tp_session_dec_refcount(_s)                                  \
-do {                                                                   \
-       pr_debug("l2tp_session_dec_refcount: %s:%d %s: cnt=%d\n",       \
-                __func__, __LINE__, (_s)->name,                        \
-                refcount_read(&_s->ref_count));                        \
-       l2tp_session_dec_refcount_1(_s);                                \
-} while (0)
-#else
-#define l2tp_session_inc_refcount(s) l2tp_session_inc_refcount_1(s)
-#define l2tp_session_dec_refcount(s) l2tp_session_dec_refcount_1(s)
-#endif
-
 #define l2tp_printk(ptr, type, func, fmt, ...)                         \
 do {                                                                   \
        if (((ptr)->debug) & (type))                                    \