From: Michael Meffie <mmeffie@sinenomine.net>
Date: Fri, 17 Aug 2012 17:25:17 +0000 (-0400)
Subject: LINUX: make d_automount work properly on rhel5 kernels
X-Git-Tag: upstream/1.6.2_pre2^2~13
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9cf0b0dcc6b4155aff7ed5bff5aea61e3a21f39c;p=packages%2Fo%2Fopenafs.git

LINUX: make d_automount work properly on rhel5 kernels

Recent centos/rhel 5 kernels (2.6.18-308.*) started providing the
d_automount operation, but renamed the DCACHE_NEED_AUTOMOUNT flag to
DMANAGED_AUTOMOUNT.

Reviewed-on: http://gerrit.openafs.org/8006
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 5daa08ea263b2a82b4a85abd61d72d4d1f48bbb6)

Change-Id: I1ebc2a3cab52ff7294b03e1e82680a99d62013fc
Reviewed-on: http://gerrit.openafs.org/8790
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Paul Smeddle <paul.smeddle@gmail.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Tested-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
index 942f10176..2dda136f8 100644
--- a/src/afs/LINUX/osi_compat.h
+++ b/src/afs/LINUX/osi_compat.h
@@ -27,6 +27,10 @@
 # endif
 #endif
 
+#if defined(STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT) && !defined(DCACHE_NEED_AUTOMOUNT)
+# define DCACHE_NEED_AUTOMOUNT DMANAGED_AUTOMOUNT
+#endif
+
 #ifdef HAVE_LINUX_STRUCT_VFS_PATH
 typedef struct vfs_path afs_linux_path_t;
 #else