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

block: move the SECTOR_SIZE related definitions to blk_types.h 



Ensure these are always available for inlines in the various block layer
headers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20211018101130.1838532-2-hch@lst.de


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

include/linux/blk_types.h

+17 −0
Original line number Diff line number Diff line
@@ -20,6 +20,23 @@ struct cgroup_subsys_state; 
typedef void (bio_end_io_t) (struct bio *);

struct bio_crypt_ctx;



/*

 * The basic unit of block I/O is a sector. It is used in a number of contexts

 * in Linux (blk, bio, genhd). The size of one sector is 512 = 2**9

 * bytes. Variables of type sector_t represent an offset or size that is a

 * multiple of 512 bytes. Hence these two constants.

 */

#ifndef SECTOR_SHIFT

#define SECTOR_SHIFT 9

#endif

#ifndef SECTOR_SIZE

#define SECTOR_SIZE (1 << SECTOR_SHIFT)

#endif



#define PAGE_SECTORS_SHIFT	(PAGE_SHIFT - SECTOR_SHIFT)

#define PAGE_SECTORS		(1 << PAGE_SECTORS_SHIFT)

#define SECTOR_MASK		(PAGE_SECTORS - 1)



struct block_device {

	sector_t		bd_start_sect;

	struct disk_stats __percpu *bd_stats;

include/linux/blkdev.h

+0 −17
Original line number Diff line number Diff line
@@ -578,23 +578,6 @@ static inline struct request_queue *bdev_get_queue(struct block_device *bdev) 
	return bdev->bd_queue;	/* this is never NULL */

}



/*

 * The basic unit of block I/O is a sector. It is used in a number of contexts

 * in Linux (blk, bio, genhd). The size of one sector is 512 = 2**9

 * bytes. Variables of type sector_t represent an offset or size that is a

 * multiple of 512 bytes. Hence these two constants.

 */

#ifndef SECTOR_SHIFT

#define SECTOR_SHIFT 9

#endif

#ifndef SECTOR_SIZE

#define SECTOR_SIZE (1 << SECTOR_SHIFT)

#endif



#define PAGE_SECTORS_SHIFT	(PAGE_SHIFT - SECTOR_SHIFT)

#define PAGE_SECTORS		(1 << PAGE_SECTORS_SHIFT)

#define SECTOR_MASK		(PAGE_SECTORS - 1)



#ifdef CONFIG_BLK_DEV_ZONED



/* Helper to convert BLK_ZONE_ZONE_XXX to its string format XXX */