Commit cfb42576 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move a few internal definitions out of blkdev.h 



All these helpers are only used in core block code, so move them out of
the public header.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20230608110258.189493-26-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bd6abfc8

block/blk.h

+21 −2
Original line number Diff line number Diff line
@@ -394,10 +394,27 @@ static inline struct bio *blk_queue_bounce(struct bio *bio, 
#ifdef CONFIG_BLK_DEV_ZONED

void disk_free_zone_bitmaps(struct gendisk *disk);

void disk_clear_zone_settings(struct gendisk *disk);

#else

int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode,

		unsigned int cmd, unsigned long arg);

int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode,

		unsigned int cmd, unsigned long arg);

#else /* CONFIG_BLK_DEV_ZONED */

static inline void disk_free_zone_bitmaps(struct gendisk *disk) {}

static inline void disk_clear_zone_settings(struct gendisk *disk) {}

#endif

static inline int blkdev_report_zones_ioctl(struct block_device *bdev,

		fmode_t mode, unsigned int cmd, unsigned long arg)

{

	return -ENOTTY;

}

static inline int blkdev_zone_mgmt_ioctl(struct block_device *bdev,

		fmode_t mode, unsigned int cmd, unsigned long arg)

{

	return -ENOTTY;

}

#endif /* CONFIG_BLK_DEV_ZONED */



struct block_device *bdev_alloc(struct gendisk *disk, u8 partno);

void bdev_add(struct block_device *bdev, dev_t dev);



int blk_alloc_ext_minor(void);

void blk_free_ext_minor(unsigned int minor);
@@ -449,6 +466,8 @@ extern struct device_attribute dev_attr_events_poll_msecs; 


extern struct attribute_group blk_trace_attr_group;



int truncate_bdev_range(struct block_device *bdev, fmode_t mode, loff_t lstart,

		loff_t lend);

long blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg);

long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg);

include/linux/blkdev.h

+0 −27
Original line number Diff line number Diff line
@@ -318,7 +318,6 @@ typedef int (*report_zones_cb)(struct blk_zone *zone, unsigned int idx, 
void disk_set_zoned(struct gendisk *disk, enum blk_zoned_model model);



#ifdef CONFIG_BLK_DEV_ZONED



#define BLK_ALL_ZONES  ((unsigned int)-1)

int blkdev_report_zones(struct block_device *bdev, sector_t sector,

			unsigned int nr_zones, report_zones_cb cb, void *data);
@@ -328,33 +327,11 @@ extern int blkdev_zone_mgmt(struct block_device *bdev, enum req_op op, 
			    gfp_t gfp_mask);

int blk_revalidate_disk_zones(struct gendisk *disk,

			      void (*update_driver_data)(struct gendisk *disk));



extern int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode,

				     unsigned int cmd, unsigned long arg);

extern int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode,

				  unsigned int cmd, unsigned long arg);



#else /* CONFIG_BLK_DEV_ZONED */



static inline unsigned int bdev_nr_zones(struct block_device *bdev)

{

	return 0;

}



static inline int blkdev_report_zones_ioctl(struct block_device *bdev,

					    fmode_t mode, unsigned int cmd,

					    unsigned long arg)

{

	return -ENOTTY;

}



static inline int blkdev_zone_mgmt_ioctl(struct block_device *bdev,

					 fmode_t mode, unsigned int cmd,

					 unsigned long arg)

{

	return -ENOTTY;

}



#endif /* CONFIG_BLK_DEV_ZONED */



/*
@@ -1493,11 +1470,7 @@ void blkdev_put(struct block_device *bdev, void *holder); 
struct block_device *blkdev_get_no_open(dev_t dev);

void blkdev_put_no_open(struct block_device *bdev);



struct block_device *bdev_alloc(struct gendisk *disk, u8 partno);

void bdev_add(struct block_device *bdev, dev_t dev);

struct block_device *I_BDEV(struct inode *inode);

int truncate_bdev_range(struct block_device *bdev, fmode_t mode, loff_t lstart,

		loff_t lend);



#ifdef CONFIG_BLOCK

void invalidate_bdev(struct block_device *bdev);