From 6e602f7924870a71e7cb1c306adb55880aaa58bd Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw@sous-sol.org>
Date: Tue, 10 Aug 2010 18:02:55 -0700
Subject: [PATCH] --- yaml --- r: 208517 b: refs/heads/master c:
 b7300b78d1a87625975a799a109a2f98d77757c8 h: refs/heads/master i:   208515:
 97e05ce49c43b1b2a6386a2cf70e84982b04f2ae v: v3

---
 [refs]               |  2 +-
 trunk/fs/block_dev.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4887d11f5329..0fee4cdf9dda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e400c28524af2d344b1663b27bf28984fa959a0e
+refs/heads/master: b7300b78d1a87625975a799a109a2f98d77757c8
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index 66411463b734..50e8c8582faa 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/fs/block_dev.c
@@ -1340,10 +1340,12 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
 	/*
 	 * hooks: /n/, see "layering violations".
 	 */
-	ret = devcgroup_inode_permission(bdev->bd_inode, perm);
-	if (ret != 0) {
-		bdput(bdev);
-		return ret;
+	if (!for_part) {
+		ret = devcgroup_inode_permission(bdev->bd_inode, perm);
+		if (ret != 0) {
+			bdput(bdev);
+			return ret;
+		}
 	}
 
  restart: