|
@@ -99,7 +99,7 @@ struct l2tp_session {
|
|
|
int nr_oos_count; /* For OOS recovery */
|
|
|
int nr_oos_count_max;
|
|
|
struct hlist_node hlist; /* Hash list node */
|
|
|
- atomic_t ref_count;
|
|
|
+ refcount_t ref_count;
|
|
|
|
|
|
char name[32]; /* for logging */
|
|
|
char ifname[IFNAMSIZ];
|
|
@@ -274,12 +274,12 @@ int l2tp_ioctl(struct sock *sk, int cmd, unsigned long arg);
|
|
|
*/
|
|
|
static inline void l2tp_session_inc_refcount_1(struct l2tp_session *session)
|
|
|
{
|
|
|
- atomic_inc(&session->ref_count);
|
|
|
+ refcount_inc(&session->ref_count);
|
|
|
}
|
|
|
|
|
|
static inline void l2tp_session_dec_refcount_1(struct l2tp_session *session)
|
|
|
{
|
|
|
- if (atomic_dec_and_test(&session->ref_count))
|
|
|
+ if (refcount_dec_and_test(&session->ref_count))
|
|
|
l2tp_session_free(session);
|
|
|
}
|
|
|
|
|
@@ -288,14 +288,14 @@ static inline void l2tp_session_dec_refcount_1(struct l2tp_session *session)
|
|
|
do { \
|
|
|
pr_debug("l2tp_session_inc_refcount: %s:%d %s: cnt=%d\n", \
|
|
|
__func__, __LINE__, (_s)->name, \
|
|
|
- atomic_read(&_s->ref_count)); \
|
|
|
+ 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, \
|
|
|
- atomic_read(&_s->ref_count)); \
|
|
|
+ refcount_read(&_s->ref_count)); \
|
|
|
l2tp_session_dec_refcount_1(_s); \
|
|
|
} while (0)
|
|
|
#else
|