mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mkiss: Use refcount_t for refcount 

refcount_t is better for reference counters since its
implementation can prevent overflows.
So convert atomic_t ref counters to refcount_t.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Chuhong Yuan 2019-08-03 00:48:21 +08:00 committed by David S. Miller
parent 31168a6d12
commit 4b4de39850
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/hamradio/mkiss.c
View File

@ -25,6 +25,7 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/refcount.h>
#include <net/ax25.h> #include <net/ax25.h>
@ -70,7 +71,7 @@ struct mkiss {
#define CRC_MODE_FLEX_TEST 3 #define CRC_MODE_FLEX_TEST 3
#define CRC_MODE_SMACK_TEST 4 #define CRC_MODE_SMACK_TEST 4
atomic_t refcnt; refcount_t refcnt;
struct completion dead; struct completion dead;
}; };
@ -668,7 +669,7 @@ static struct mkiss *mkiss_get(struct tty_struct *tty)
read_lock(&disc_data_lock); read_lock(&disc_data_lock);
ax = tty->disc_data; ax = tty->disc_data;
if (ax) if (ax)
atomic_inc(&ax->refcnt); refcount_inc(&ax->refcnt);
read_unlock(&disc_data_lock); read_unlock(&disc_data_lock);
return ax; return ax;
@ -676,7 +677,7 @@ static struct mkiss *mkiss_get(struct tty_struct *tty)
static void mkiss_put(struct mkiss *ax) static void mkiss_put(struct mkiss *ax)
{ {
if (atomic_dec_and_test(&ax->refcnt)) if (refcount_dec_and_test(&ax->refcnt))
complete(&ax->dead); complete(&ax->dead);
} }
@ -704,7 +705,7 @@ static int mkiss_open(struct tty_struct *tty)
ax->dev = dev; ax->dev = dev;
spin_lock_init(&ax->buflock); spin_lock_init(&ax->buflock);
atomic_set(&ax->refcnt, 1); refcount_set(&ax->refcnt, 1);
init_completion(&ax->dead); init_completion(&ax->dead);
ax->tty = tty; ax->tty = tty;
@ -784,7 +785,7 @@ static void mkiss_close(struct tty_struct *tty)
* We have now ensured that nobody can start using ap from now on, but * We have now ensured that nobody can start using ap from now on, but
* we have to wait for all existing users to finish. * we have to wait for all existing users to finish.
*/ */
if (!atomic_dec_and_test(&ax->refcnt)) if (!refcount_dec_and_test(&ax->refcnt))
wait_for_completion(&ax->dead); wait_for_completion(&ax->dead);
/* /*
* Halt the transmit queue so that a new transmit cannot scribble * Halt the transmit queue so that a new transmit cannot scribble