Merge branch 'master' into for-linus

1 files changed, 6 insertions, 4 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 66411463b734..50e8c8582faa 100644
--- a/fs/block_dev.c
+++ b/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: