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 #include #include +#include #include #include #include @@ -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);