diff options
| author | Christian Brauner <brauner@kernel.org> | 2024-11-26 18:15:06 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-11-26 18:15:06 +0100 |
| commit | cf87766dd6f9ddcceaa8ee26e3cbd7538e42dd19 (patch) | |
| tree | 8531685628a090333db2f874688ac07624b51072 /fs/xfs/libxfs/xfs_log_format.h | |
| parent | c66f759832a83cb273ba5a55c66dcc99384efa74 (diff) | |
| parent | 2957fa4931a3b658d8e54eda9439d4c57967e8ad (diff) | |
| download | linux-cf87766dd6f9ddcceaa8ee26e3cbd7538e42dd19.tar.gz linux-cf87766dd6f9ddcceaa8ee26e3cbd7538e42dd19.tar.bz2 linux-cf87766dd6f9ddcceaa8ee26e3cbd7538e42dd19.zip | |
Merge branch 'ovl.fixes'
Bring in an overlayfs fix for v6.13-rc1 that fixes a bug introduced by
the overlayfs changes merged for v6.13.
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/xfs/libxfs/xfs_log_format.h')
| -rw-r--r-- | fs/xfs/libxfs/xfs_log_format.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h index 3e6682ed656b..15dec19b6c32 100644 --- a/fs/xfs/libxfs/xfs_log_format.h +++ b/fs/xfs/libxfs/xfs_log_format.h @@ -248,6 +248,8 @@ typedef struct xfs_trans_header { #define XFS_LI_ATTRD 0x1247 /* attr set/remove done */ #define XFS_LI_XMI 0x1248 /* mapping exchange intent */ #define XFS_LI_XMD 0x1249 /* mapping exchange done */ +#define XFS_LI_EFI_RT 0x124a /* realtime extent free intent */ +#define XFS_LI_EFD_RT 0x124b /* realtime extent free done */ #define XFS_LI_TYPE_DESC \ { XFS_LI_EFI, "XFS_LI_EFI" }, \ @@ -267,7 +269,9 @@ typedef struct xfs_trans_header { { XFS_LI_ATTRI, "XFS_LI_ATTRI" }, \ { XFS_LI_ATTRD, "XFS_LI_ATTRD" }, \ { XFS_LI_XMI, "XFS_LI_XMI" }, \ - { XFS_LI_XMD, "XFS_LI_XMD" } + { XFS_LI_XMD, "XFS_LI_XMD" }, \ + { XFS_LI_EFI_RT, "XFS_LI_EFI_RT" }, \ + { XFS_LI_EFD_RT, "XFS_LI_EFD_RT" } /* * Inode Log Item Format definitions. @@ -404,7 +408,7 @@ struct xfs_log_dinode { uint16_t di_mode; /* mode and type of file */ int8_t di_version; /* inode version */ int8_t di_format; /* format of di_c data */ - uint8_t di_pad3[2]; /* unused in v2/3 inodes */ + uint16_t di_metatype; /* metadata type, if DIFLAG2_METADATA */ uint32_t di_uid; /* owner's user id */ uint32_t di_gid; /* owner's group id */ uint32_t di_nlink; /* number of links to file */ |