Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[AX25]: sparse cleanups

Browse source 
net/ax25/ax25_route.c:251:13: warning: context imbalance in
'ax25_rt_seq_start' - wrong count at exit
net/ax25/ax25_route.c:276:13: warning: context imbalance in 'ax25_rt_seq_stop'
- unexpected unlock
net/ax25/ax25_std_timer.c:65:25: warning: expensive signed divide
net/ax25/ax25_uid.c:46:1: warning: symbol 'ax25_uid_list' was not declared.
Should it be static?
net/ax25/ax25_uid.c:146:13: warning: context imbalance in 'ax25_uid_seq_start'
- wrong count at exit
net/ax25/ax25_uid.c:169:13: warning: context imbalance in 'ax25_uid_seq_stop'
- unexpected unlock
net/ax25/af_ax25.c:573:28: warning: expensive signed divide
net/ax25/af_ax25.c:1865:13: warning: context imbalance in 'ax25_info_start' -
wrong count at exit
net/ax25/af_ax25.c:1888:13: warning: context imbalance in 'ax25_info_stop' -
unexpected unlock
net/ax25/ax25_ds_timer.c:133:25: warning: expensive signed divide

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2008-01-13 22:29:41 -08:00 committed by David S. Miller
parent 6bf1574ee3
commit f16f3026db
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/ax25/af_ax25.c
View file

@ -570,7 +570,7 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,
res = -EINVAL; res = -EINVAL;
break; break;
} }
ax25->rtt = (opt * HZ) / 2; ax25->rtt = (opt * HZ) >> 1;
ax25->t1 = opt * HZ; ax25->t1 = opt * HZ;
break; break;
@ -1863,6 +1863,7 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static void *ax25_info_start(struct seq_file *seq, loff_t *pos) static void *ax25_info_start(struct seq_file *seq, loff_t *pos)
__acquires(ax25_list_lock)
{ {
struct ax25_cb *ax25; struct ax25_cb *ax25;
struct hlist_node *node; struct hlist_node *node;
@ -1886,6 +1887,7 @@ static void *ax25_info_next(struct seq_file *seq, void *v, loff_t *pos)
} }
static void ax25_info_stop(struct seq_file *seq, void *v) static void ax25_info_stop(struct seq_file *seq, void *v)
__releases(ax25_list_lock)
{ {
spin_unlock_bh(&ax25_list_lock); spin_unlock_bh(&ax25_list_lock);
} }

2
net/ax25/ax25_ds_timer.c
View file

@ -130,7 +130,7 @@ void ax25_ds_heartbeat_expiry(ax25_cb *ax25)
*/ */
if (sk != NULL) { if (sk != NULL) {
if (atomic_read(&sk->sk_rmem_alloc) < if (atomic_read(&sk->sk_rmem_alloc) <
(sk->sk_rcvbuf / 2) && (sk->sk_rcvbuf >> 1) &&
(ax25->condition & AX25_COND_OWN_RX_BUSY)) { (ax25->condition & AX25_COND_OWN_RX_BUSY)) {
ax25->condition &= ~AX25_COND_OWN_RX_BUSY; ax25->condition &= ~AX25_COND_OWN_RX_BUSY;
ax25->condition &= ~AX25_COND_ACK_PENDING; ax25->condition &= ~AX25_COND_ACK_PENDING;

2
net/ax25/ax25_route.c
View file

@ -249,6 +249,7 @@ int ax25_rt_ioctl(unsigned int cmd, void __user *arg)
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static void *ax25_rt_seq_start(struct seq_file *seq, loff_t *pos) static void *ax25_rt_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(ax25_route_lock)
{ {
struct ax25_route *ax25_rt; struct ax25_route *ax25_rt;
int i = 1; int i = 1;
@ -274,6 +275,7 @@ static void *ax25_rt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
} }
static void ax25_rt_seq_stop(struct seq_file *seq, void *v) static void ax25_rt_seq_stop(struct seq_file *seq, void *v)
__releases(ax25_route_lock)
{ {
read_unlock(&ax25_route_lock); read_unlock(&ax25_route_lock);
} }

4
net/ax25/ax25_std_timer.c
View file

@ -32,7 +32,7 @@
void ax25_std_heartbeat_expiry(ax25_cb *ax25) void ax25_std_heartbeat_expiry(ax25_cb *ax25)
{ {
struct sock *sk=ax25->sk; struct sock *sk = ax25->sk;
if (sk) if (sk)
bh_lock_sock(sk); bh_lock_sock(sk);
@ -62,7 +62,7 @@ void ax25_std_heartbeat_expiry(ax25_cb *ax25)
*/ */
if (sk != NULL) { if (sk != NULL) {
if (atomic_read(&sk->sk_rmem_alloc) < if (atomic_read(&sk->sk_rmem_alloc) <
(sk->sk_rcvbuf / 2) && (sk->sk_rcvbuf >> 1) &&
(ax25->condition & AX25_COND_OWN_RX_BUSY)) { (ax25->condition & AX25_COND_OWN_RX_BUSY)) {
ax25->condition &= ~AX25_COND_OWN_RX_BUSY; ax25->condition &= ~AX25_COND_OWN_RX_BUSY;
ax25->condition &= ~AX25_COND_ACK_PENDING; ax25->condition &= ~AX25_COND_ACK_PENDING;

6
net/ax25/ax25_uid.c
View file

@ -43,10 +43,10 @@
* Callsign/UID mapper. This is in kernel space for security on multi-amateur machines. * Callsign/UID mapper. This is in kernel space for security on multi-amateur machines.
*/ */
HLIST_HEAD(ax25_uid_list); static HLIST_HEAD(ax25_uid_list);
static DEFINE_RWLOCK(ax25_uid_lock); static DEFINE_RWLOCK(ax25_uid_lock);
int ax25_uid_policy = 0; int ax25_uid_policy;
EXPORT_SYMBOL(ax25_uid_policy); EXPORT_SYMBOL(ax25_uid_policy);
@ -144,6 +144,7 @@ int ax25_uid_ioctl(int cmd, struct sockaddr_ax25 *sax)
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static void *ax25_uid_seq_start(struct seq_file *seq, loff_t *pos) static void *ax25_uid_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(ax25_uid_lock)
{ {
struct ax25_uid_assoc *pt; struct ax25_uid_assoc *pt;
struct hlist_node *node; struct hlist_node *node;
@ -167,6 +168,7 @@ static void *ax25_uid_seq_next(struct seq_file *seq, void *v, loff_t *pos)
} }
static void ax25_uid_seq_stop(struct seq_file *seq, void *v) static void ax25_uid_seq_stop(struct seq_file *seq, void *v)
__releases(ax25_uid_lock)
{ {
read_unlock(&ax25_uid_lock); read_unlock(&ax25_uid_lock);
} }