diff options
author | Francesco Fusco <ffusco@redhat.com> | 2013-08-15 07:42:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-15 17:37:46 -0400 |
commit | d14c5ab6bef6a46170b84c3589b27768e979f93d (patch) | |
tree | 5bcf83fa3477c67ffa6f9486c1adade354ba8a22 | |
parent | 40a82917b1d3a8aecedee6b64949795b75359731 (diff) |
net: proc_fs: trivial: print UIDs as unsigned int
UIDs are printed in the proc_fs as signed int, whereas
they are unsigned int.
Signed-off-by: Francesco Fusco <ffusco@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/appletalk/atalk_proc.c | 2 | ||||
-rw-r--r-- | net/ipv4/ping.c | 2 | ||||
-rw-r--r-- | net/ipv4/raw.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 | ||||
-rw-r--r-- | net/ipv4/udp.c | 2 | ||||
-rw-r--r-- | net/ipv6/datagram.c | 2 | ||||
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 | ||||
-rw-r--r-- | net/ipx/ipx_proc.c | 2 | ||||
-rw-r--r-- | net/llc/llc_proc.c | 2 | ||||
-rw-r--r-- | net/phonet/socket.c | 2 | ||||
-rw-r--r-- | net/sctp/proc.c | 4 |
11 files changed, 14 insertions, 14 deletions
diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c index c30f3a0717fb..af46bc49e1e9 100644 --- a/net/appletalk/atalk_proc.c +++ b/net/appletalk/atalk_proc.c | |||
@@ -178,7 +178,7 @@ static int atalk_seq_socket_show(struct seq_file *seq, void *v) | |||
178 | at = at_sk(s); | 178 | at = at_sk(s); |
179 | 179 | ||
180 | seq_printf(seq, "%02X %04X:%02X:%02X %04X:%02X:%02X %08X:%08X " | 180 | seq_printf(seq, "%02X %04X:%02X:%02X %04X:%02X:%02X %08X:%08X " |
181 | "%02X %d\n", | 181 | "%02X %u\n", |
182 | s->sk_type, ntohs(at->src_net), at->src_node, at->src_port, | 182 | s->sk_type, ntohs(at->src_net), at->src_node, at->src_port, |
183 | ntohs(at->dest_net), at->dest_node, at->dest_port, | 183 | ntohs(at->dest_net), at->dest_node, at->dest_port, |
184 | sk_wmem_alloc_get(s), | 184 | sk_wmem_alloc_get(s), |
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 746427c9e719..d7d9882d4cae 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c | |||
@@ -1082,7 +1082,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f, | |||
1082 | __u16 srcp = ntohs(inet->inet_sport); | 1082 | __u16 srcp = ntohs(inet->inet_sport); |
1083 | 1083 | ||
1084 | seq_printf(f, "%5d: %08X:%04X %08X:%04X" | 1084 | seq_printf(f, "%5d: %08X:%04X %08X:%04X" |
1085 | " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %pK %d%n", | 1085 | " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d%n", |
1086 | bucket, src, srcp, dest, destp, sp->sk_state, | 1086 | bucket, src, srcp, dest, destp, sp->sk_state, |
1087 | sk_wmem_alloc_get(sp), | 1087 | sk_wmem_alloc_get(sp), |
1088 | sk_rmem_alloc_get(sp), | 1088 | sk_rmem_alloc_get(sp), |
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index dd44e0ab600c..41d84505a922 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
@@ -987,7 +987,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) | |||
987 | srcp = inet->inet_num; | 987 | srcp = inet->inet_num; |
988 | 988 | ||
989 | seq_printf(seq, "%4d: %08X:%04X %08X:%04X" | 989 | seq_printf(seq, "%4d: %08X:%04X %08X:%04X" |
990 | " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %pK %d\n", | 990 | " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d\n", |
991 | i, src, srcp, dest, destp, sp->sk_state, | 991 | i, src, srcp, dest, destp, sp->sk_state, |
992 | sk_wmem_alloc_get(sp), | 992 | sk_wmem_alloc_get(sp), |
993 | sk_rmem_alloc_get(sp), | 993 | sk_rmem_alloc_get(sp), |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index ec2702882d8d..05a3d45d3102 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -2608,7 +2608,7 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req, | |||
2608 | long delta = req->expires - jiffies; | 2608 | long delta = req->expires - jiffies; |
2609 | 2609 | ||
2610 | seq_printf(f, "%4d: %08X:%04X %08X:%04X" | 2610 | seq_printf(f, "%4d: %08X:%04X %08X:%04X" |
2611 | " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n", | 2611 | " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK%n", |
2612 | i, | 2612 | i, |
2613 | ireq->loc_addr, | 2613 | ireq->loc_addr, |
2614 | ntohs(inet_sk(sk)->inet_sport), | 2614 | ntohs(inet_sk(sk)->inet_sport), |
@@ -2666,7 +2666,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len) | |||
2666 | rx_queue = max_t(int, tp->rcv_nxt - tp->copied_seq, 0); | 2666 | rx_queue = max_t(int, tp->rcv_nxt - tp->copied_seq, 0); |
2667 | 2667 | ||
2668 | seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " | 2668 | seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " |
2669 | "%08X %5d %8d %lu %d %pK %lu %lu %u %u %d%n", | 2669 | "%08X %5u %8d %lu %d %pK %lu %lu %u %u %d%n", |
2670 | i, src, srcp, dest, destp, sk->sk_state, | 2670 | i, src, srcp, dest, destp, sk->sk_state, |
2671 | tp->write_seq - tp->snd_una, | 2671 | tp->write_seq - tp->snd_una, |
2672 | rx_queue, | 2672 | rx_queue, |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 9e88af0e8ab0..0b24508bcdc4 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -2159,7 +2159,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f, | |||
2159 | __u16 srcp = ntohs(inet->inet_sport); | 2159 | __u16 srcp = ntohs(inet->inet_sport); |
2160 | 2160 | ||
2161 | seq_printf(f, "%5d: %08X:%04X %08X:%04X" | 2161 | seq_printf(f, "%5d: %08X:%04X %08X:%04X" |
2162 | " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %pK %d%n", | 2162 | " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d%n", |
2163 | bucket, src, srcp, dest, destp, sp->sk_state, | 2163 | bucket, src, srcp, dest, destp, sp->sk_state, |
2164 | sk_wmem_alloc_get(sp), | 2164 | sk_wmem_alloc_get(sp), |
2165 | sk_rmem_alloc_get(sp), | 2165 | sk_rmem_alloc_get(sp), |
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 197e6f4a2b74..48b6bd2a9a14 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c | |||
@@ -890,7 +890,7 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp, | |||
890 | src = &np->rcv_saddr; | 890 | src = &np->rcv_saddr; |
891 | seq_printf(seq, | 891 | seq_printf(seq, |
892 | "%5d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " | 892 | "%5d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " |
893 | "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %pK %d\n", | 893 | "%02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d\n", |
894 | bucket, | 894 | bucket, |
895 | src->s6_addr32[0], src->s6_addr32[1], | 895 | src->s6_addr32[0], src->s6_addr32[1], |
896 | src->s6_addr32[2], src->s6_addr32[3], srcp, | 896 | src->s6_addr32[2], src->s6_addr32[3], srcp, |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 38c196ca6011..5bcfadf09e95 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1731,7 +1731,7 @@ static void get_openreq6(struct seq_file *seq, | |||
1731 | 1731 | ||
1732 | seq_printf(seq, | 1732 | seq_printf(seq, |
1733 | "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " | 1733 | "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " |
1734 | "%02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK\n", | 1734 | "%02X %08X:%08X %02X:%08lX %08X %5u %8d %d %d %pK\n", |
1735 | i, | 1735 | i, |
1736 | src->s6_addr32[0], src->s6_addr32[1], | 1736 | src->s6_addr32[0], src->s6_addr32[1], |
1737 | src->s6_addr32[2], src->s6_addr32[3], | 1737 | src->s6_addr32[2], src->s6_addr32[3], |
@@ -1782,7 +1782,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) | |||
1782 | 1782 | ||
1783 | seq_printf(seq, | 1783 | seq_printf(seq, |
1784 | "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " | 1784 | "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " |
1785 | "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %pK %lu %lu %u %u %d\n", | 1785 | "%02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %lu %lu %u %u %d\n", |
1786 | i, | 1786 | i, |
1787 | src->s6_addr32[0], src->s6_addr32[1], | 1787 | src->s6_addr32[0], src->s6_addr32[1], |
1788 | src->s6_addr32[2], src->s6_addr32[3], srcp, | 1788 | src->s6_addr32[2], src->s6_addr32[3], srcp, |
diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c index 65e8833a2510..e15c16a517e7 100644 --- a/net/ipx/ipx_proc.c +++ b/net/ipx/ipx_proc.c | |||
@@ -213,7 +213,7 @@ static int ipx_seq_socket_show(struct seq_file *seq, void *v) | |||
213 | ntohs(ipxs->dest_addr.sock)); | 213 | ntohs(ipxs->dest_addr.sock)); |
214 | } | 214 | } |
215 | 215 | ||
216 | seq_printf(seq, "%08X %08X %02X %03d\n", | 216 | seq_printf(seq, "%08X %08X %02X %03u\n", |
217 | sk_wmem_alloc_get(s), | 217 | sk_wmem_alloc_get(s), |
218 | sk_rmem_alloc_get(s), | 218 | sk_rmem_alloc_get(s), |
219 | s->sk_state, | 219 | s->sk_state, |
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index 7b4799cfbf8d..1a3c7e0f5d0d 100644 --- a/net/llc/llc_proc.c +++ b/net/llc/llc_proc.c | |||
@@ -147,7 +147,7 @@ static int llc_seq_socket_show(struct seq_file *seq, void *v) | |||
147 | } | 147 | } |
148 | seq_printf(seq, "@%02X ", llc->sap->laddr.lsap); | 148 | seq_printf(seq, "@%02X ", llc->sap->laddr.lsap); |
149 | llc_ui_format_mac(seq, llc->daddr.mac); | 149 | llc_ui_format_mac(seq, llc->daddr.mac); |
150 | seq_printf(seq, "@%02X %8d %8d %2d %3d %4d\n", llc->daddr.lsap, | 150 | seq_printf(seq, "@%02X %8d %8d %2d %3u %4d\n", llc->daddr.lsap, |
151 | sk_wmem_alloc_get(sk), | 151 | sk_wmem_alloc_get(sk), |
152 | sk_rmem_alloc_get(sk) - llc->copied_seq, | 152 | sk_rmem_alloc_get(sk) - llc->copied_seq, |
153 | sk->sk_state, | 153 | sk->sk_state, |
diff --git a/net/phonet/socket.c b/net/phonet/socket.c index 1afd1381cdc7..77e38f733496 100644 --- a/net/phonet/socket.c +++ b/net/phonet/socket.c | |||
@@ -793,7 +793,7 @@ static int pn_res_seq_show(struct seq_file *seq, void *v) | |||
793 | struct sock **psk = v; | 793 | struct sock **psk = v; |
794 | struct sock *sk = *psk; | 794 | struct sock *sk = *psk; |
795 | 795 | ||
796 | seq_printf(seq, "%02X %5d %lu%n", | 796 | seq_printf(seq, "%02X %5u %lu%n", |
797 | (int) (psk - pnres.sk), | 797 | (int) (psk - pnres.sk), |
798 | from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)), | 798 | from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)), |
799 | sock_i_ino(sk), &len); | 799 | sock_i_ino(sk), &len); |
diff --git a/net/sctp/proc.c b/net/sctp/proc.c index 82432bfb742f..0c0642156842 100644 --- a/net/sctp/proc.c +++ b/net/sctp/proc.c | |||
@@ -226,7 +226,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v) | |||
226 | sk = epb->sk; | 226 | sk = epb->sk; |
227 | if (!net_eq(sock_net(sk), seq_file_net(seq))) | 227 | if (!net_eq(sock_net(sk), seq_file_net(seq))) |
228 | continue; | 228 | continue; |
229 | seq_printf(seq, "%8pK %8pK %-3d %-3d %-4d %-5d %5d %5lu ", ep, sk, | 229 | seq_printf(seq, "%8pK %8pK %-3d %-3d %-4d %-5d %5u %5lu ", ep, sk, |
230 | sctp_sk(sk)->type, sk->sk_state, hash, | 230 | sctp_sk(sk)->type, sk->sk_state, hash, |
231 | epb->bind_addr.port, | 231 | epb->bind_addr.port, |
232 | from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)), | 232 | from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)), |
@@ -336,7 +336,7 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) | |||
336 | continue; | 336 | continue; |
337 | seq_printf(seq, | 337 | seq_printf(seq, |
338 | "%8pK %8pK %-3d %-3d %-2d %-4d " | 338 | "%8pK %8pK %-3d %-3d %-2d %-4d " |
339 | "%4d %8d %8d %7d %5lu %-5d %5d ", | 339 | "%4d %8d %8d %7u %5lu %-5d %5d ", |
340 | assoc, sk, sctp_sk(sk)->type, sk->sk_state, | 340 | assoc, sk, sctp_sk(sk)->type, sk->sk_state, |
341 | assoc->state, hash, | 341 | assoc->state, hash, |
342 | assoc->assoc_id, | 342 | assoc->assoc_id, |