From f7f3131260285d88bb7f0148362343c8e8ecdecb Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Fri, 15 Jun 2012 12:52:46 +0200
Subject: [PATCH] --- yaml --- r: 311601 b: refs/heads/master c:
 6d9359280753d2955f86d6411047516a9431eb51 h: refs/heads/master i:   311599:
 28113470f2ca3e1a06f3fe98ca119f7632a08a4c v: v3

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

diff --git a/[refs] b/[refs]
index 2145fcb3fd9a..81b722eaf580 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76aaa5101fffaef12b45b4c01ed0d0528f23dedf
+refs/heads/master: 6d9359280753d2955f86d6411047516a9431eb51
diff --git a/trunk/block/scsi_ioctl.c b/trunk/block/scsi_ioctl.c
index 260fa80ef575..9a87daa6f4fb 100644
--- a/trunk/block/scsi_ioctl.c
+++ b/trunk/block/scsi_ioctl.c
@@ -721,11 +721,14 @@ int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)
 		break;
 	}
 
+	if (capable(CAP_SYS_RAWIO))
+		return 0;
+
 	/* In particular, rule out all resets and host-specific ioctls.  */
 	printk_ratelimited(KERN_WARNING
 			   "%s: sending ioctl %x to a partition!\n", current->comm, cmd);
 
-	return capable(CAP_SYS_RAWIO) ? 0 : -ENOIOCTLCMD;
+	return -ENOIOCTLCMD;
 }
 EXPORT_SYMBOL(scsi_verify_blk_ioctl);