From b68dd8cf8e99151fada131d72cc0acabfc9d8ba8 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Fri, 7 Oct 2005 19:41:34 +0200
Subject: [PATCH] --- yaml --- r: 9759 b: refs/heads/master c:
 3b0e77bd144203a507eb191f7117d2c5004ea1de h: refs/heads/master i:   9757:
 3db6ae5fa82dc5710b60acf7a8108b6649ca75e0   9755:
 63f7a089cb3ab7a9cee21611033bcd3589903317   9751:
 3121adfe479fff9a8781ee3425dee48f88e88ca1   9743:
 56b988211033897a2f382f5e61fcf5a125edc1bc   9727:
 9fd69630b0ff3461dda280121975f8b75c734709 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/scsi_ioctl.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b12fdbe5c3a9..be47bcf8b568 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8aa19ad84c38cd50bfc0560646efe1c9ca83d925
+refs/heads/master: 3b0e77bd144203a507eb191f7117d2c5004ea1de
diff --git a/trunk/drivers/block/scsi_ioctl.c b/trunk/drivers/block/scsi_ioctl.c
index 079ec344eb47..382dea7b224c 100644
--- a/trunk/drivers/block/scsi_ioctl.c
+++ b/trunk/drivers/block/scsi_ioctl.c
@@ -201,15 +201,15 @@ static int verify_command(struct file *file, unsigned char *cmd)
 			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;
 }