From: Simon Glass <simon.glass@canonical.com> Add xattr_user.c and xattr_hurd.c to the ext4l build: - Update includes to use ext4_uboot.h - Add d_sb member to struct dentry - Add XATTR_HURD_PREFIX to linux/xattr.h Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- fs/ext4l/Makefile | 4 ++-- fs/ext4l/ext4_uboot.h | 1 + fs/ext4l/xattr_hurd.c | 1 + fs/ext4l/xattr_user.c | 2 +- include/linux/xattr.h | 3 +++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/ext4l/Makefile b/fs/ext4l/Makefile index cfb1413ba30..4a8a94035b9 100644 --- a/fs/ext4l/Makefile +++ b/fs/ext4l/Makefile @@ -8,5 +8,5 @@ obj-y := interface.o stub.o obj-y += balloc.o bitmap.o block_validity.o ext4_jbd2.o extents.o \ extents_status.o hash.o ialloc.o \ indirect.o \ - xattr_trusted.o \ - orphan.o + xattr_hurd.o xattr_trusted.o \ + xattr_user.o orphan.o diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h index 32b497deadc..1d0c58c4f38 100644 --- a/fs/ext4l/ext4_uboot.h +++ b/fs/ext4l/ext4_uboot.h @@ -526,6 +526,7 @@ struct qstr { struct dentry { struct qstr d_name; struct inode *d_inode; + struct super_block *d_sb; }; /* vm_fault_t - stub */ diff --git a/fs/ext4l/xattr_hurd.c b/fs/ext4l/xattr_hurd.c index 8a5842e4cd9..5ef4d058da1 100644 --- a/fs/ext4l/xattr_hurd.c +++ b/fs/ext4l/xattr_hurd.c @@ -9,6 +9,7 @@ #include <linux/init.h> #include <linux/string.h> +#include "ext4_uboot.h" #include "ext4.h" #include "xattr.h" diff --git a/fs/ext4l/xattr_user.c b/fs/ext4l/xattr_user.c index 4b70bf4e762..16370f6143d 100644 --- a/fs/ext4l/xattr_user.c +++ b/fs/ext4l/xattr_user.c @@ -7,7 +7,7 @@ */ #include <linux/string.h> -#include <linux/fs.h> +#include "ext4_uboot.h" #include "ext4_jbd2.h" #include "ext4.h" #include "xattr.h" diff --git a/include/linux/xattr.h b/include/linux/xattr.h index f5dc7953a05..db1bf4d3ee6 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -27,6 +27,9 @@ #define XATTR_SYSTEM_PREFIX "system." #define XATTR_SYSTEM_PREFIX_LEN 7 +#define XATTR_HURD_PREFIX "gnu." +#define XATTR_HURD_PREFIX_LEN 4 + /* Maximum size of an xattr value */ #define XATTR_SIZE_MAX 65536 -- 2.43.0