* [PATCH 01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit()
[not found] <cover.1308142053.git.manuel.f.zerpies@ww.stud.uni-erlangen.de>
@ 2011-06-16 12:06 ` Manuel Zerpies
2011-06-16 14:19 ` Borislav Petkov
2011-06-16 14:32 ` Sergei Shtylyov
0 siblings, 2 replies; 5+ messages in thread
From: Manuel Zerpies @ 2011-06-16 12:06 UTC (permalink / raw)
To: David S. Miller, linux-ide, linux-kernel, christian.dietrich
Since printk_ratelimit() shouldn't be used anymore (see comment in
include/linux/printk.h), replace it with printk_ratelimited().
Signed-off-by: Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de>
---
drivers/ide/ide-atapi.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 6f218e01..1b04f45 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -8,6 +8,7 @@
#include <linux/ide.h>
#include <linux/scatterlist.h>
#include <linux/gfp.h>
+#include <linux/ratelimit.h>
#include <scsi/scsi.h>
@@ -200,8 +201,7 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq)
err = blk_rq_map_kern(drive->queue, sense_rq, sense, sense_len,
GFP_NOIO);
if (unlikely(err)) {
- if (printk_ratelimit())
- printk(KERN_WARNING PFX "%s: failed to map sense "
+ printk_ratelimited(KERN_WARNING PFX "%s: failed to map sense "
"buffer\n", drive->name);
return;
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit()
2011-06-16 12:06 ` [PATCH 01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit() Manuel Zerpies
@ 2011-06-16 14:19 ` Borislav Petkov
2011-06-20 8:17 ` Manuel Zerpies
2011-06-16 14:32 ` Sergei Shtylyov
1 sibling, 1 reply; 5+ messages in thread
From: Borislav Petkov @ 2011-06-16 14:19 UTC (permalink / raw)
To: Manuel Zerpies
Cc: David S. Miller, linux-ide, linux-kernel, christian.dietrich
On Thu, Jun 16, 2011 at 02:06:37PM +0200, Manuel Zerpies wrote:
> Since printk_ratelimit() shouldn't be used anymore (see comment in
> include/linux/printk.h), replace it with printk_ratelimited().
>
> Signed-off-by: Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de>
> ---
> drivers/ide/ide-atapi.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
> index 6f218e01..1b04f45 100644
> --- a/drivers/ide/ide-atapi.c
> +++ b/drivers/ide/ide-atapi.c
> @@ -8,6 +8,7 @@
> #include <linux/ide.h>
> #include <linux/scatterlist.h>
> #include <linux/gfp.h>
> +#include <linux/ratelimit.h>
>
> #include <scsi/scsi.h>
>
> @@ -200,8 +201,7 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq)
> err = blk_rq_map_kern(drive->queue, sense_rq, sense, sense_len,
> GFP_NOIO);
> if (unlikely(err)) {
> - if (printk_ratelimit())
> - printk(KERN_WARNING PFX "%s: failed to map sense "
> + printk_ratelimited(KERN_WARNING PFX "%s: failed to map sense "
> "buffer\n", drive->name);
Does the printk fit on one line if you do
pr_warn_ratelimited(...)
instead?
Thanks.
--
Regards/Gruss,
Boris.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit()
2011-06-16 12:06 ` [PATCH 01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit() Manuel Zerpies
2011-06-16 14:19 ` Borislav Petkov
@ 2011-06-16 14:32 ` Sergei Shtylyov
1 sibling, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2011-06-16 14:32 UTC (permalink / raw)
To: Manuel Zerpies
Cc: David S. Miller, linux-ide, linux-kernel, christian.dietrich
Hello.
Manuel Zerpies wrote:
> Since printk_ratelimit() shouldn't be used anymore (see comment in
> include/linux/printk.h), replace it with printk_ratelimited().
> Signed-off-by: Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de>
> ---
> drivers/ide/ide-atapi.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
> index 6f218e01..1b04f45 100644
> --- a/drivers/ide/ide-atapi.c
> +++ b/drivers/ide/ide-atapi.c
> @@ -8,6 +8,7 @@
> #include <linux/ide.h>
> #include <linux/scatterlist.h>
> #include <linux/gfp.h>
> +#include <linux/ratelimit.h>
>
> #include <scsi/scsi.h>
>
> @@ -200,8 +201,7 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq)
> err = blk_rq_map_kern(drive->queue, sense_rq, sense, sense_len,
> GFP_NOIO);
> if (unlikely(err)) {
> - if (printk_ratelimit())
> - printk(KERN_WARNING PFX "%s: failed to map sense "
> + printk_ratelimited(KERN_WARNING PFX "%s: failed to map sense "
Why not pr_warn_ratelimited()?
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit()
2011-06-16 14:19 ` Borislav Petkov
@ 2011-06-20 8:17 ` Manuel Zerpies
2011-06-20 8:22 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Manuel Zerpies @ 2011-06-20 8:17 UTC (permalink / raw)
To: Borislav Petkov, Manuel Zerpies, David S. Miller, linux-ide,
linux-kernel
Hello,
2011/6/16 Borislav Petkov <bp@alien8.de>
>
> On Thu, Jun 16, 2011 at 02:06:37PM +0200, Manuel Zerpies wrote:
>
> Does the printk fit on one line if you do
>
> pr_warn_ratelimited(...)
>
> instead?
>
> Thanks.
>
> --
> Regards/Gruss,
> Boris.
No I'm affraid. I tried it, but it didn't fit the 80 chars per line
code-styling.
>Why not pr_warn_ratelimited()?
>WBR, Sergei
I just kind of ignored it. As you see, I built it in.
Here my new patch:
Since printk_ratelimit() shouldn't be used anymore (see comment in
include/linux/printk.h), replace it with printk_ratelimited().
Signed-off-by: Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de>
---
drivers/ide/ide-atapi.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 6f218e01..c9e69d7 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -8,6 +8,7 @@
#include <linux/ide.h>
#include <linux/scatterlist.h>
#include <linux/gfp.h>
+#include <linux/ratelimit.h>
#include <scsi/scsi.h>
@@ -200,9 +201,8 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq)
err = blk_rq_map_kern(drive->queue, sense_rq, sense, sense_len,
GFP_NOIO);
if (unlikely(err)) {
- if (printk_ratelimit())
- printk(KERN_WARNING PFX "%s: failed to map sense "
- "buffer\n", drive->name);
+ pr_warn_ratelimited(PFX "%s: failed to map sense buffer\n",
+ drive->name);
return;
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit()
2011-06-20 8:17 ` Manuel Zerpies
@ 2011-06-20 8:22 ` Sergei Shtylyov
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2011-06-20 8:22 UTC (permalink / raw)
To: Manuel Zerpies
Cc: Borislav Petkov, David S. Miller, linux-ide, linux-kernel,
christian.dietrich, sshtylyov
Hello.
On 20-06-2011 12:17, Manuel Zerpies wrote:
>> Does the printk fit on one line if you do
>> pr_warn_ratelimited(...)
>> instead?
>> Thanks.
>> --
>> Regards/Gruss,
>> Boris.
> No I'm affraid. I tried it, but it didn't fit the 80 chars per line
> code-styling.
It's enough that the string literal fits on one line.
>> Why not pr_warn_ratelimited()?
>> WBR, Sergei
> I just kind of ignored it. As you see, I built it in.
> Here my new patch:
> Since printk_ratelimit() shouldn't be used anymore (see comment in
> include/linux/printk.h), replace it with printk_ratelimited().
This doesn't match the patch anymore...
> Signed-off-by: Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de>
> ---
> drivers/ide/ide-atapi.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
> diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
> index 6f218e01..c9e69d7 100644
> --- a/drivers/ide/ide-atapi.c
> +++ b/drivers/ide/ide-atapi.c
> @@ -8,6 +8,7 @@
> #include<linux/ide.h>
> #include<linux/scatterlist.h>
> #include<linux/gfp.h>
> +#include<linux/ratelimit.h>
>
> #include<scsi/scsi.h>
>
> @@ -200,9 +201,8 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq)
> err = blk_rq_map_kern(drive->queue, sense_rq, sense, sense_len,
> GFP_NOIO);
> if (unlikely(err)) {
> - if (printk_ratelimit())
> - printk(KERN_WARNING PFX "%s: failed to map sense "
> - "buffer\n", drive->name);
> + pr_warn_ratelimited(PFX "%s: failed to map sense buffer\n",
> + drive->name);
> return;
> }
Unfortunately, the new patch is whitespace-damaged.
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-06-20 8:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1308142053.git.manuel.f.zerpies@ww.stud.uni-erlangen.de>
2011-06-16 12:06 ` [PATCH 01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit() Manuel Zerpies
2011-06-16 14:19 ` Borislav Petkov
2011-06-20 8:17 ` Manuel Zerpies
2011-06-20 8:22 ` Sergei Shtylyov
2011-06-16 14:32 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).