[PATCH] scsi_ioctl: only warn for rejected commands

We should not be warning about commands that we allow, even if they are
unknown. So move the if-root-allow check up a notch.

Signed-off-by: Jens Axboe <[e-mail]>
Signed-off-by: Linus Torvalds <[e-mail]>

drivers/block/scsi_ioctl.c

···
 			return 0;
 	}
 
+	/* And root can do any command.. */
+	if (capable(CAP_SYS_RAWIO))
+		return 0;
+
 	if (!type) {
 		cmd_type[cmd[0]] = CMD_WARNED;
 		printk(KERN_WARNING "scsi: unknown opcode 0x%02x\n", cmd[0]);
 	}
-
-	/* And root can do any command.. */
-	if (capable(CAP_SYS_RAWIO))
-		return 0;
 
 	/* Otherwise fail it with an "Operation not permitted" */
 	return -EPERM;