diff options
| author | Carlos Maiolino <cem@kernel.org> | 2025-05-14 12:38:53 +0200 |
|---|---|---|
| committer | Carlos Maiolino <cem@kernel.org> | 2025-05-14 12:38:53 +0200 |
| commit | 6e7d71b3a0f9732863b6a1366c9d875cec52c842 (patch) | |
| tree | 2ae0295a950939f40b39aa0aff344a8e70d97e76 /block | |
| parent | c0a5c4084709a78117c1c372aa4f813e1a98c313 (diff) | |
| parent | 4abb9052a72bc98d521b0535b5deee243a3bbd12 (diff) | |
| download | linux-next-6e7d71b3a0f9732863b6a1366c9d875cec52c842.tar.gz linux-next-6e7d71b3a0f9732863b6a1366c9d875cec52c842.zip | |
Merge branch 'atomic_writes-6.16' into xfs-6.16-merge
Required update due to conflict with patch:
xfs: stop using set_blocksize
Conflicts:
fs/xfs/xfs_buf.c
Signed-off-by: Carlos Maiolino <cem@kernel.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/bdev.c b/block/bdev.c index 520515e4e64e..9f321fb94bac 100644 --- a/block/bdev.c +++ b/block/bdev.c @@ -1336,7 +1336,8 @@ void bdev_statx(struct path *path, struct kstat *stat, generic_fill_statx_atomic_writes(stat, queue_atomic_write_unit_min_bytes(bd_queue), - queue_atomic_write_unit_max_bytes(bd_queue)); + queue_atomic_write_unit_max_bytes(bd_queue), + 0); } stat->blksize = bdev_io_min(bdev); |