From dbedb9a5f0bdd0012e8e15379b807d313060b65a Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Fri, 2 Dec 2022 13:40:38 -0600 Subject: [PATCH] LU-16364 llite: Move d_u.d_alias compat define Breaks zpl_d_drop_aliases (seen in 2.1.7) The only user of d_alias is llite so move the define to a header private to llite. Test-Parameters: trivial HPE-bug-id: LUS-11394 Signed-off-by: Shaun Tancheff Change-Id: I44f511073f4dd17fd6dba1588e88d29cdfd3f6cb Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49308 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Petros Koutoupis Reviewed-by: Oleg Drokin --- lustre/include/lustre_compat.h | 4 ---- lustre/llite/llite_internal.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/include/lustre_compat.h b/lustre/include/lustre_compat.h index aef5943..6857d81 100644 --- a/lustre/include/lustre_compat.h +++ b/lustre/include/lustre_compat.h @@ -75,10 +75,6 @@ #define d_child d_u.d_child #endif -#ifdef HAVE_DENTRY_D_U_D_ALIAS -#define d_alias d_u.d_alias -#endif - #ifndef HAVE_D_IN_LOOKUP static inline int d_in_lookup(struct dentry *dentry) { diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h index da36467..6a1161f 100644 --- a/lustre/llite/llite_internal.h +++ b/lustre/llite/llite_internal.h @@ -65,6 +65,10 @@ #define LOOKUP_CONTINUE LOOKUP_PARENT #endif +#ifdef HAVE_DENTRY_D_U_D_ALIAS +#define d_alias d_u.d_alias +#endif + /** Only used on client-side for indicating the tail of dir hash/offset. */ #define LL_DIR_END_OFF 0x7fffffffffffffffULL #define LL_DIR_END_OFF_32BIT 0x7fffffffUL -- 1.8.3.1