From 6bf1574ee33270e7c0b9d43103e8cedffd9f74db Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sun, 13 Jan 2008 22:27:52 -0800 Subject: [X25]: Avoid divides and sparse warnings CHECK net/x25/af_x25.c net/x25/af_x25.c:117:46: warning: expensive signed divide CHECK net/x25/x25_facilities.c net/x25/x25_facilities.c:209:30: warning: expensive signed divide CHECK net/x25/x25_in.c net/x25/x25_in.c:250:26: warning: expensive signed divide CHECK net/x25/x25_proc.c net/x25/x25_proc.c:48:11: warning: context imbalance in 'x25_seq_route_start' - wrong count at exit net/x25/x25_proc.c:72:13: warning: context imbalance in 'x25_seq_route_stop' - unexpected unlock net/x25/x25_proc.c:112:11: warning: context imbalance in 'x25_seq_socket_start' - wrong count at exit net/x25/x25_proc.c:129:13: warning: context imbalance in 'x25_seq_socket_stop' - unexpected unlock net/x25/x25_proc.c:190:11: warning: context imbalance in 'x25_seq_forward_start' - wrong count at exit net/x25/x25_proc.c:215:13: warning: context imbalance in 'x25_seq_forward_stop' - unexpected unlock CHECK net/x25/x25_subr.c net/x25/x25_subr.c:362:57: warning: expensive signed divide Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller --- net/x25/x25_proc.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'net/x25/x25_proc.c') diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c index 7d55e50c936..78b05342606 100644 --- a/net/x25/x25_proc.c +++ b/net/x25/x25_proc.c @@ -41,6 +41,7 @@ found: } static void *x25_seq_route_start(struct seq_file *seq, loff_t *pos) + __acquires(x25_route_list_lock) { loff_t l = *pos; @@ -70,6 +71,7 @@ out: } static void x25_seq_route_stop(struct seq_file *seq, void *v) + __releases(x25_route_list_lock) { read_unlock_bh(&x25_route_list_lock); } @@ -105,6 +107,7 @@ found: } static void *x25_seq_socket_start(struct seq_file *seq, loff_t *pos) + __acquires(x25_list_lock) { loff_t l = *pos; @@ -127,6 +130,7 @@ out: } static void x25_seq_socket_stop(struct seq_file *seq, void *v) + __releases(x25_list_lock) { read_unlock_bh(&x25_list_lock); } @@ -183,6 +187,7 @@ found: } static void *x25_seq_forward_start(struct seq_file *seq, loff_t *pos) + __acquires(x25_forward_list_lock) { loff_t l = *pos; @@ -213,6 +218,7 @@ out: } static void x25_seq_forward_stop(struct seq_file *seq, void *v) + __releases(x25_forward_list_lock) { read_unlock_bh(&x25_forward_list_lock); } -- cgit v1.2.3-70-g09d2 From a1f6f5a7689098f01d9b7b7181795ee78563ce37 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 22 Jan 2008 18:30:06 -0800 Subject: [AF_X25]: constify function pointer tables Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller --- net/x25/x25_proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/x25/x25_proc.c') diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c index 78b05342606..3f52b09bed0 100644 --- a/net/x25/x25_proc.c +++ b/net/x25/x25_proc.c @@ -293,7 +293,7 @@ static const struct file_operations x25_seq_route_fops = { .release = seq_release, }; -static struct file_operations x25_seq_forward_fops = { +static const struct file_operations x25_seq_forward_fops = { .owner = THIS_MODULE, .open = x25_seq_forward_open, .read = seq_read, -- cgit v1.2.3-70-g09d2