torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

scsi/sg: use printk_ratelimited instead of printk_ratelimit

Browse Source 
Since printk_ratelimit() shouldn't be used anymore (see comment in
include/linux/printk.h), replace it with printk_ratelimited.

Signed-off-by: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Christian Dietrich 2011-06-04 17:36:10 +02:00 committed by Jiri Kosina
parent a28ee477e5
commit 2fe038e33c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/scsi/sg.c
View File

@ -50,6 +50,7 @@ static int sg_version_num = 30534; /* 2 digits for each component */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/blktrace_api.h> #include <linux/blktrace_api.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/ratelimit.h>
#include "scsi.h" #include "scsi.h"
#include <scsi/scsi_dbg.h> #include <scsi/scsi_dbg.h>
@ -626,11 +627,12 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
*/ */
if (hp->dxfer_direction == SG_DXFER_TO_FROM_DEV) { if (hp->dxfer_direction == SG_DXFER_TO_FROM_DEV) {
static char cmd[TASK_COMM_LEN]; static char cmd[TASK_COMM_LEN];
if (strcmp(current->comm, cmd) && printk_ratelimit()) { if (strcmp(current->comm, cmd)) {
printk(KERN_WARNING printk_ratelimited(KERN_WARNING
"sg_write: data in/out %d/%d bytes for SCSI command 0x%x--" "sg_write: data in/out %d/%d bytes "
"guessing data in;\n " "for SCSI command 0x%x-- guessing "
"program %s not setting count and/or reply_len properly\n", "data in;\n program %s not setting "
"count and/or reply_len properly\n",
old_hdr.reply_len - (int)SZ_SG_HEADER, old_hdr.reply_len - (int)SZ_SG_HEADER,
input_size, (unsigned int) cmnd[0], input_size, (unsigned int) cmnd[0],
current->comm); current->comm);