diff options
| author | Andrew Clemons <andrew.clemons@gmail.com> | 2022-02-05 16:45:32 +1300 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-06 15:47:04 +0700 |
| commit | af599fc9462de4c2859dbd373b81490ed3b6122c (patch) | |
| tree | b78e7291c3b5ce004cccc97a4cb0e21f1f6ba28d /system/ext4magic/01-i_dir_acl.patch | |
| parent | 31a033587dd2db58e74ca9c9bec2d941a764f70e (diff) | |
system/ext4magic: Fix build with newer gcc.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/ext4magic/01-i_dir_acl.patch')
| -rw-r--r-- | system/ext4magic/01-i_dir_acl.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/system/ext4magic/01-i_dir_acl.patch b/system/ext4magic/01-i_dir_acl.patch new file mode 100644 index 0000000000..37e9c47510 --- /dev/null +++ b/system/ext4magic/01-i_dir_acl.patch @@ -0,0 +1,29 @@ +From: Gokturk Yuksek <gokturk@gentoo.org> +Subject: [PATCH] src/inode: supersede i_dir_acl with i_size_high + +The upstream has removed the macro that defined i_dir_acl as +i_size_high which causes a build failure with the later versions of +e2fsprogs. Replace every reference to inode->i_dir_acl with +inode->i_size_high. + +[0] https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=578fcbfd2e61e0b13ce8c7b62804c941d6c1eb8e + +--- a/src/inode.c ++++ b/src/inode.c +@@ -404,14 +404,14 @@ + fprintf(out, + "%sFile ACL: %d Directory ACL: %d Translator: %d\n", + prefix, +- inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0, ++ inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0, + inode->osd1.hurd1.h_i_translator); + else + fprintf(out, "%sFile ACL: %llu Directory ACL: %d\n", + prefix, + inode->i_file_acl | ((long long) + (inode->osd2.linux2.l_i_file_acl_high) << 32), +- LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0); ++ LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0); + if (os == EXT2_OS_LINUX) + fprintf(out, "%sLinks: %d Blockcount: %llu\n", + prefix, inode->i_links_count, |