diff options
| author | Carlos Maiolino <cem@kernel.org> | 2025-04-28 11:32:06 +0200 |
|---|---|---|
| committer | Carlos Maiolino <cem@kernel.org> | 2025-04-28 11:32:06 +0200 |
| commit | d0d7f1813dc748390673480ad0271a65a7ee5a57 (patch) | |
| tree | 0b637c3ff5cd855b7da6376c9541c4f030300680 /include/linux | |
| parent | f0447f80aec83f1699d599c94618bb5c323963e6 (diff) | |
| parent | f40139fde5278d81af3227444fd6e76a76b9506d (diff) | |
Merge remote-tracking branch 'linux-block/block-6.15' into xfs tree
We need two patches inside linux-block tree as dependencies of the patch
which will follow this merge.
Specifically, we need:
block: fix race between set_blocksize and read paths
block: hoist block size validation code to a separate function
Signed-off-by: Carlos Maiolino <cem@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e39c45bc0a97..14abaeedaa88 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1614,6 +1614,7 @@ static inline void bio_end_io_acct(struct bio *bio, unsigned long start_time) return bio_end_io_acct_remapped(bio, start_time, bio->bi_bdev); } +int bdev_validate_blocksize(struct block_device *bdev, int block_size); int set_blocksize(struct file *file, int size); int lookup_bdev(const char *pathname, dev_t *dev); @@ -1670,10 +1671,6 @@ int bd_prepare_to_claim(struct block_device *bdev, void *holder, const struct blk_holder_ops *hops); void bd_abort_claiming(struct block_device *bdev, void *holder); -/* just for blk-cgroup, don't use elsewhere */ -struct block_device *blkdev_get_no_open(dev_t dev); -void blkdev_put_no_open(struct block_device *bdev); - struct block_device *I_BDEV(struct inode *inode); struct block_device *file_bdev(struct file *bdev_file); bool disk_live(struct gendisk *disk); |