diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-10-22 16:21:51 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-10-22 16:21:51 +0200 |
| commit | fdad1a20cd57bff65539d971c0ec74faf2b5b2fc (patch) | |
| tree | e4ece36cb7ef3b3d69df0869eb735c9670eb54f9 /include | |
| parent | block: flush all throttled bios when deleting the cgroup (diff) | |
| parent | block: Add bdev atomic write limits helpers (diff) | |
| download | linux-fdad1a20cd57bff65539d971c0ec74faf2b5b2fc.tar.xz linux-fdad1a20cd57bff65539d971c0ec74faf2b5b2fc.zip | |
Merge branch 'for-6.13/block-atomic' into for-6.13/block
Merge in block/fs prep patches for the atomic write support.
* for-6.13/block-atomic:
block: Add bdev atomic write limits helpers
fs/block: Check for IOCB_DIRECT in generic_atomic_write_valid()
block/fs: Pass an iocb to generic_atomic_write_valid()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 16 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 6b78a68e0bd9..55bec14fe55f 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1682,6 +1682,22 @@ static inline bool bdev_can_atomic_write(struct block_device *bdev) return true; } +static inline unsigned int +bdev_atomic_write_unit_min_bytes(struct block_device *bdev) +{ + if (!bdev_can_atomic_write(bdev)) + return 0; + return queue_atomic_write_unit_min_bytes(bdev_get_queue(bdev)); +} + +static inline unsigned int +bdev_atomic_write_unit_max_bytes(struct block_device *bdev) +{ + if (!bdev_can_atomic_write(bdev)) + return 0; + return queue_atomic_write_unit_max_bytes(bdev_get_queue(bdev)); +} + #define DEFINE_IO_COMP_BATCH(name) struct io_comp_batch name = { } #endif /* _LINUX_BLKDEV_H */ diff --git a/include/linux/fs.h b/include/linux/fs.h index 3559446279c1..4b5cad44a126 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3726,6 +3726,6 @@ static inline bool vfs_empty_path(int dfd, const char __user *path) return !c; } -bool generic_atomic_write_valid(struct iov_iter *iter, loff_t pos); +int generic_atomic_write_valid(struct kiocb *iocb, struct iov_iter *iter); #endif /* _LINUX_FS_H */ |