mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
block: opencode devcgroup_inode_permission
Just call devcgroup_check_permission to avoid various superflous checks and a double conversion of the access flags. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Tejun Heo <tj@kernel.org> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
63d9932cae
commit
7918f0f6fd
1 changed files with 4 additions and 6 deletions
|
@ -1520,15 +1520,13 @@ static int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder)
|
||||||
struct block_device *claiming;
|
struct block_device *claiming;
|
||||||
bool unblock_events = true;
|
bool unblock_events = true;
|
||||||
struct gendisk *disk;
|
struct gendisk *disk;
|
||||||
int perm = 0;
|
|
||||||
int partno;
|
int partno;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (mode & FMODE_READ)
|
ret = devcgroup_check_permission(DEVCG_DEV_BLOCK,
|
||||||
perm |= MAY_READ;
|
imajor(bdev->bd_inode), iminor(bdev->bd_inode),
|
||||||
if (mode & FMODE_WRITE)
|
((mode & FMODE_READ) ? DEVCG_ACC_READ : 0) |
|
||||||
perm |= MAY_WRITE;
|
((mode & FMODE_WRITE) ? DEVCG_ACC_WRITE : 0));
|
||||||
ret = devcgroup_inode_permission(bdev->bd_inode, perm);
|
|
||||||
if (ret)
|
if (ret)
|
||||||
goto bdput;
|
goto bdput;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue