block: opencode devcgroup_inode_permission

[linux-2.6-microblaze.git] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index a2d5050..2b8c058 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1520,15 +1520,13 @@ static int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder)
        struct block_device *claiming;
        bool unblock_events = true;
        struct gendisk *disk;
-       int perm = 0;
        int partno;
        int ret;
 
-       if (mode & FMODE_READ)
-               perm |= MAY_READ;
-       if (mode & FMODE_WRITE)
-               perm |= MAY_WRITE;
-       ret = devcgroup_inode_permission(bdev->bd_inode, perm);
+       ret = devcgroup_check_permission(DEVCG_DEV_BLOCK,
+                       imajor(bdev->bd_inode), iminor(bdev->bd_inode),
+                       ((mode & FMODE_READ) ? DEVCG_ACC_READ : 0) |
+                       ((mode & FMODE_WRITE) ? DEVCG_ACC_WRITE : 0));
        if (ret)
                goto bdput;