wok diff ext4magic/stuff/patches/ext4magic-0.3.2-i_dir_acl.patch @ rev 25561

created recipe for ext4magic
author Hans-G?nter Theisgen
date Sun Apr 30 06:26:09 2023 +0100 (2023-04-30)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ext4magic/stuff/patches/ext4magic-0.3.2-i_dir_acl.patch	Sun Apr 30 06:26:09 2023 +0100
     1.3 @@ -0,0 +1,29 @@
     1.4 +From: Gokturk Yuksek <gokturk@gentoo.org>
     1.5 +Subject: [PATCH] src/inode: supersede i_dir_acl with i_size_high
     1.6 +
     1.7 +The upstream has removed the macro that defined i_dir_acl as
     1.8 +i_size_high which causes a build failure with the later versions of
     1.9 +e2fsprogs. Replace every reference to inode->i_dir_acl with
    1.10 +inode->i_size_high.
    1.11 +
    1.12 +[0] https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=578fcbfd2e61e0b13ce8c7b62804c941d6c1eb8e
    1.13 +
    1.14 +--- a/src/inode.c
    1.15 ++++ b/src/inode.c
    1.16 +@@ -404,14 +404,14 @@
    1.17 +         fprintf(out,
    1.18 +                         "%sFile ACL: %d    Directory ACL: %d Translator: %d\n",
    1.19 +                         prefix,
    1.20 +-                        inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0,
    1.21 ++                        inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0,
    1.22 +                         inode->osd1.hurd1.h_i_translator);
    1.23 +         else
    1.24 +                 fprintf(out, "%sFile ACL: %llu    Directory ACL: %d\n",
    1.25 +                         prefix,
    1.26 +                         inode->i_file_acl | ((long long)
    1.27 +                                 (inode->osd2.linux2.l_i_file_acl_high) << 32),
    1.28 +-                        LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0);
    1.29 ++                        LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0);
    1.30 +         if (os == EXT2_OS_LINUX)
    1.31 +                 fprintf(out, "%sLinks: %d   Blockcount: %llu\n",
    1.32 +                         prefix, inode->i_links_count,