From 360375ddb8a9cd4ed5229330fe094de6a8634ed0 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sun, 13 Jan 2008 17:41:43 +0100 Subject: [PATCH] --- yaml --- r: 77129 b: refs/heads/master c: eaa3e22e8d32bf7a6176f04efad90f4a5aa67f58 h: refs/heads/master i: 77127: d028240cd56b55bfee0073d650e788caee29d797 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sg.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b0ea288e9c5c..d7fa4abfba3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d496f94d22d1491ffb25f4000e85f7a4ecf7f2c4 +refs/heads/master: eaa3e22e8d32bf7a6176f04efad90f4a5aa67f58 diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c index f1871ea04045..e65f5d432662 100644 --- a/trunk/drivers/scsi/sg.c +++ b/trunk/drivers/scsi/sg.c @@ -602,8 +602,9 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos) * but is is possible that the app intended SG_DXFER_TO_DEV, because there * is a non-zero input_size, so emit a warning. */ - if (hp->dxfer_direction == SG_DXFER_TO_FROM_DEV) - if (printk_ratelimit()) + if (hp->dxfer_direction == SG_DXFER_TO_FROM_DEV) { + static char cmd[TASK_COMM_LEN]; + if (strcmp(current->comm, cmd) && printk_ratelimit()) { printk(KERN_WARNING "sg_write: data in/out %d/%d bytes for SCSI command 0x%x--" "guessing data in;\n" KERN_WARNING " " @@ -611,6 +612,9 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos) old_hdr.reply_len - (int)SZ_SG_HEADER, input_size, (unsigned int) cmnd[0], current->comm); + strcpy(cmd, current->comm); + } + } k = sg_common_write(sfp, srp, cmnd, sfp->timeout, blocking); return (k < 0) ? k : count; }