hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: move the devcgroup_inode_permission call to blkdev_get 

devcgroup_inode_permission is never called for the recusive case, so
move it out into blkdev_get.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2020-08-31 20:02:36 +02:00 committed by Jens Axboe
parent 46d40cfad1
commit e5c7fb4002
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/block_dev.c
View File

@ -1449,22 +1449,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, void *holder,
struct gendisk *disk; struct gendisk *disk;
int ret; int ret;
int partno; int partno;
int perm = 0;
bool first_open = false, unblock_events = true, need_restart; bool first_open = false, unblock_events = true, need_restart;
if (mode & FMODE_READ)
perm |= MAY_READ;
if (mode & FMODE_WRITE)
perm |= MAY_WRITE;
/*
* hooks: /n/, see "layering violations".
*/
if (!for_part) {
ret = devcgroup_inode_permission(bdev->bd_inode, perm);
if (ret != 0)
return ret;
}
restart: restart:
need_restart = false; need_restart = false;
ret = -ENXIO; ret = -ENXIO;
@ -1637,12 +1623,24 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, void *holder,
*/ */
int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder) int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder)
{ {
int res; int ret, perm = 0;
res =__blkdev_get(bdev, mode, holder, 0); if (mode & FMODE_READ)
if (res) perm |= MAY_READ;
bdput(bdev); if (mode & FMODE_WRITE)
return res; perm |= MAY_WRITE;
ret = devcgroup_inode_permission(bdev->bd_inode, perm);
if (ret)
goto bdput;
ret =__blkdev_get(bdev, mode, holder, 0);
if (ret)
goto bdput;
return 0;
bdput:
bdput(bdev);
return ret;
} }
EXPORT_SYMBOL(blkdev_get); EXPORT_SYMBOL(blkdev_get);