From f5f5dbbb960fb34c0a78a51ff3115f60820e181f Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Thu, 5 Jun 2008 22:46:27 -0700
Subject: [PATCH] --- yaml --- r: 97805 b: refs/heads/master c:
 7db9cfd380205f6b50afdc3bc3619f876a5eaf0d h: refs/heads/master i:   97803:
 a9cf002ff6087852f60ff15d187cb18c4a7f3947 v: v3

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

diff --git a/[refs] b/[refs]
index a0106639e3e5..1ee3510263e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc9cb219aac24ffc711566c8f372c2b3a3bf840f
+refs/heads/master: 7db9cfd380205f6b50afdc3bc3619f876a5eaf0d
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index 7d822fae7765..470c10ceb0fb 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/fs/block_dev.c
@@ -12,6 +12,7 @@
 #include <linux/kmod.h>
 #include <linux/major.h>
 #include <linux/smp_lock.h>
+#include <linux/device_cgroup.h>
 #include <linux/highmem.h>
 #include <linux/blkdev.h>
 #include <linux/module.h>
@@ -928,9 +929,14 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part)
 {
 	struct module *owner = NULL;
 	struct gendisk *disk;
-	int ret = -ENXIO;
+	int ret;
 	int part;
 
+	ret = devcgroup_inode_permission(bdev->bd_inode, file->f_mode);
+	if (ret != 0)
+		return ret;
+
+	ret = -ENXIO;
 	file->f_mapping = bdev->bd_inode->i_mapping;
 	lock_kernel();
 	disk = get_gendisk(bdev->bd_dev, &part);