diff options
author | Joe Perches <joe@perches.com> | 2012-05-13 17:56:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-15 13:45:03 -0400 |
commit | e87cc4728f0e2fb663e592a1141742b1d6c63256 (patch) | |
tree | b8219696d37f0c8d0521d5853560b97fc96dc667 /net/atm | |
parent | 3a3bfb61e64476ff1e4ac3122cb6dec9c79b795c (diff) |
net: Convert net_ratelimit uses to net_<level>_ratelimited
Standardize the net core ratelimited logging functions.
Coalesce formats, align arguments.
Change a printk then vprintk sequence to use printf extension %pV.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/ioctl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c index 62dc8bfe6fe7..bbd3b639992e 100644 --- a/net/atm/ioctl.c +++ b/net/atm/ioctl.c | |||
@@ -97,9 +97,8 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, | |||
97 | error = sock_get_timestampns(sk, argp); | 97 | error = sock_get_timestampns(sk, argp); |
98 | goto done; | 98 | goto done; |
99 | case ATM_SETSC: | 99 | case ATM_SETSC: |
100 | if (net_ratelimit()) | 100 | net_warn_ratelimited("ATM_SETSC is obsolete; used by %s:%d\n", |
101 | pr_warning("ATM_SETSC is obsolete; used by %s:%d\n", | 101 | current->comm, task_pid_nr(current)); |
102 | current->comm, task_pid_nr(current)); | ||
103 | error = 0; | 102 | error = 0; |
104 | goto done; | 103 | goto done; |
105 | case ATMSIGD_CTRL: | 104 | case ATMSIGD_CTRL: |
@@ -123,8 +122,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, | |||
123 | work for 32-bit userspace. TBH I don't really want | 122 | work for 32-bit userspace. TBH I don't really want |
124 | to think about it at all. dwmw2. */ | 123 | to think about it at all. dwmw2. */ |
125 | if (compat) { | 124 | if (compat) { |
126 | if (net_ratelimit()) | 125 | net_warn_ratelimited("32-bit task cannot be atmsigd\n"); |
127 | pr_warning("32-bit task cannot be atmsigd\n"); | ||
128 | error = -EINVAL; | 126 | error = -EINVAL; |
129 | goto done; | 127 | goto done; |
130 | } | 128 | } |