Patchwork [01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit()

login
register
mail settings
Submitter Manuel Zerpies
Date June 20, 2011, 8:17 a.m.
Message ID <BANLkTim=yg+tCxa-JhMYw5zsnBSzQqVnqg@mail.gmail.com>
Download mbox | patch
Permalink /patch/101058/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Manuel Zerpies - June 20, 2011, 8:17 a.m.
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(-)
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sergei Shtylyov - June 20, 2011, 8:22 a.m.
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
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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;
  }