diff options
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch new file mode 100644 index 0000000000..6fefbb2bca --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From f9ba9752ba5fd72441bc2018b2453967e75460d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
3 | Date: Mon, 24 Jun 2024 02:00:11 +0000 | ||
4 | Subject: [PATCH] convert: handle rename of inode_includes() from e2fsprogs | ||
5 | 1.47.1 | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | [https://kernel.googlesource.com/pub/scm/linux/kernel/git/kdave/btrfs-progs/+/bcb887a4de2c56426a7a7de8d440b6ad75579f10%5E%21/#F0] | ||
9 | |||
10 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
11 | --- | ||
12 | configure.ac | 3 ++- | ||
13 | convert/source-ext2.c | 11 +++++++++-- | ||
14 | 2 files changed, 11 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 007d29b..816dd36 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -312,7 +312,8 @@ AS_IF([test "x$have_ext4_epoch_mask_define" = xno], [ | ||
21 | AC_DEFINE([EXT4_EPOCH_BITS], [2],[for encode and decode tv_nsec in ext2 inode]) | ||
22 | AC_DEFINE([EXT4_EPOCH_MASK], [((1U << EXT4_EPOCH_BITS) - 1)], [For encode and decode tv_nsec info in ext2 inode]) | ||
23 | AC_DEFINE([EXT4_NSEC_MASK], [(~0UL << EXT4_EPOCH_BITS)], [For encode and decode tv_nsec info in ext2 inode]) | ||
24 | - AC_DEFINE([inode_includes(size, field)],[m4_normalize[(size >= (sizeof(((struct ext2_inode_large *)0)->field) + offsetof(struct ext2_inode_large, field)))]], | ||
25 | + # Use name from 1.47.1, backward compatibility is handled in convert/source-ext2.c | ||
26 | + AC_DEFINE([ext2fs_inode_includes(size, field)],[m4_normalize[(size >= (sizeof(((struct ext2_inode_large *)0)->field) + offsetof(struct ext2_inode_large, field)))]], | ||
27 | [For encode and decode tv_nsec info in ext2 inode]) | ||
28 | ], | ||
29 | [AC_MSG_WARN([It seems that ext2_inode_large don't includes tv_nsec related info, probably old e2fsprogs, no 64bit time precision of converted images])], | ||
30 | diff --git a/convert/source-ext2.c b/convert/source-ext2.c | ||
31 | index 2186b25..bba81e4 100644 | ||
32 | --- a/convert/source-ext2.c | ||
33 | +++ b/convert/source-ext2.c | ||
34 | @@ -727,10 +727,17 @@ static inline void ext4_decode_extra_time(__le32 * tv_sec, __le32 * tv_nsec, | ||
35 | *tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS; | ||
36 | } | ||
37 | |||
38 | +/* | ||
39 | + * In e2fsprogs < 1.47.1 it's inode_includes, from >= on it's with ext2fs_ prefix. | ||
40 | + */ | ||
41 | +#ifndef ext2fs_inode_includes | ||
42 | +#define ext2fs_inode_includes(size, field) inode_includes(size, field) | ||
43 | +#endif | ||
44 | + | ||
45 | #define EXT4_COPY_XTIME(xtime, dst, tv_sec, tv_nsec) \ | ||
46 | do { \ | ||
47 | tv_sec = src->i_ ## xtime ; \ | ||
48 | - if (inode_includes(inode_size, i_ ## xtime ## _extra)) { \ | ||
49 | + if (ext2fs_inode_includes(inode_size, i_ ## xtime ## _extra)) { \ | ||
50 | tv_sec = src->i_ ## xtime ; \ | ||
51 | ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_ ## xtime ## _extra); \ | ||
52 | btrfs_set_stack_timespec_sec(&dst->xtime , tv_sec); \ | ||
53 | @@ -771,7 +778,7 @@ static int ext4_copy_inode_timespec_extra(struct btrfs_inode_item *dst, | ||
54 | EXT4_COPY_XTIME(ctime, dst, tv_sec, tv_nsec); | ||
55 | |||
56 | tv_sec = src->i_crtime; | ||
57 | - if (inode_includes(inode_size, i_crtime_extra)) { | ||
58 | + if (ext2fs_inode_includes(inode_size, i_crtime_extra)) { | ||
59 | tv_sec = src->i_crtime; | ||
60 | ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_crtime_extra); | ||
61 | btrfs_set_stack_timespec_sec(&dst->otime, tv_sec); | ||
62 | -- | ||
63 | 2.34.1 | ||
64 | |||