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 /include/linux | |
| parent | c0a5c4084709a78117c1c372aa4f813e1a98c313 (diff) | |
| parent | 4abb9052a72bc98d521b0535b5deee243a3bbd12 (diff) | |
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 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 3 | ||||
| -rw-r--r-- | include/linux/stat.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 016b0fe1536e..7b19d8f99aff 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3475,7 +3475,8 @@ void generic_fillattr(struct mnt_idmap *, u32, struct inode *, struct kstat *); void generic_fill_statx_attr(struct inode *inode, struct kstat *stat); void generic_fill_statx_atomic_writes(struct kstat *stat, unsigned int unit_min, - unsigned int unit_max); + unsigned int unit_max, + unsigned int unit_max_opt); extern int vfs_getattr_nosec(const struct path *, struct kstat *, u32, unsigned int); extern int vfs_getattr(const struct path *, struct kstat *, u32, unsigned int); void __inode_add_bytes(struct inode *inode, loff_t bytes); diff --git a/include/linux/stat.h b/include/linux/stat.h index be7496a6a0dd..e3d00e7bb26d 100644 --- a/include/linux/stat.h +++ b/include/linux/stat.h @@ -57,6 +57,7 @@ struct kstat { u32 dio_read_offset_align; u32 atomic_write_unit_min; u32 atomic_write_unit_max; + u32 atomic_write_unit_max_opt; u32 atomic_write_segments_max; }; |