diff --git a/include/os/linux/kernel/linux/dcache_compat.h b/include/os/linux/kernel/linux/dcache_compat.h
index 4de1118daafa..c43e5b142fd6 100644
--- a/include/os/linux/kernel/linux/dcache_compat.h
+++ b/include/os/linux/kernel/linux/dcache_compat.h
@@ -1,85 +1,85 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or https://opensource.org/licenses/CDDL-1.0.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright (C) 2011 Lawrence Livermore National Security, LLC.
  */
 
 #ifndef _ZFS_DCACHE_H
 #define	_ZFS_DCACHE_H
 
 #include <linux/dcache.h>
 
 #define	dname(dentry)	((char *)((dentry)->d_name.name))
 #define	dlen(dentry)	((int)((dentry)->d_name.len))
 
 #ifndef HAVE_D_MAKE_ROOT
 #define	d_make_root(inode)	d_alloc_root(inode)
 #endif /* HAVE_D_MAKE_ROOT */
 
+#ifdef HAVE_DENTRY_D_U_ALIASES
+#define	d_alias			d_u.d_alias
+#endif
+
 /*
  * 2.6.30 API change,
  * The const keyword was added to the 'struct dentry_operations' in
  * the dentry structure.  To handle this we define an appropriate
  * dentry_operations_t typedef which can be used.
  */
 typedef const struct dentry_operations	dentry_operations_t;
 
 /*
  * 2.6.38 API addition,
  * Added d_clear_d_op() helper function which clears some flags and the
  * registered dentry->d_op table.  This is required because d_set_d_op()
  * issues a warning when the dentry operations table is already set.
  * For the .zfs control directory to work properly we must be able to
  * override the default operations table and register custom .d_automount
  * and .d_revalidate callbacks.
  */
 static inline void
 d_clear_d_op(struct dentry *dentry)
 {
 	dentry->d_op = NULL;
 	dentry->d_flags &= ~(
 	    DCACHE_OP_HASH | DCACHE_OP_COMPARE |
 	    DCACHE_OP_REVALIDATE | DCACHE_OP_DELETE);
 }
 
 /*
  * Walk and invalidate all dentry aliases of an inode
  * unless it's a mountpoint
  */
 static inline void
 zpl_d_drop_aliases(struct inode *inode)
 {
 	struct dentry *dentry;
 	spin_lock(&inode->i_lock);
-#ifdef HAVE_DENTRY_D_U_ALIASES
-	hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
-#else
 	hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
-#endif
 		if (!IS_ROOT(dentry) && !d_mountpoint(dentry) &&
 		    (dentry->d_inode == inode)) {
 			d_drop(dentry);
 		}
 	}
 	spin_unlock(&inode->i_lock);
 }
 #endif /* _ZFS_DCACHE_H */