diff options
| author | Christoph Hellwig | 2021-10-12 12:44:50 +0200 |
|---|---|---|
| committer | Jens Axboe | 2021-10-18 06:17:34 -0600 |
| commit | 8a709512eae7ccd5ba73e8634474caadbc9ebe76 (patch) | |
| tree | e27b922a97a915f4caacdf473db858a59d0d131c /block/blk.h | |
| parent | 84b8514b46b417e299746b1297d3d0899e8539f3 (diff) | |
block: merge block_ioctl into blkdev_ioctl
Simplify the ioctl path and match the code structure on the compat side.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211012104450.659013-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/blk.h b/block/blk.h index eadb2a640a69..618482b29671 100644 --- a/block/blk.h +++ b/block/blk.h @@ -405,8 +405,7 @@ static inline void bio_clear_hipri(struct bio *bio) bio->bi_opf &= ~REQ_HIPRI; } -int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, - unsigned long arg); +long blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg); long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg); extern const struct address_space_operations def_blk_aops; |