From: adilger <adilger>
Date: Fri, 25 Jan 2008 00:16:26 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_7_0_51~291
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=223839b09b4b0294bcc0f44aec032c8921f49f93;hp=201678cc0c3b4893b780da575d138a9a85451978;p=fs%2Flustre-release.git

Branch b1_6
Allow newer ldiskfs with d_rehash_cond() and d_move_locked() to build
against older kernels with the older __d_rehash() and __d_move() functions.

Minor reformatting of configure.ac to match GNU autoconf coding style.
http://www.gnu.org/software/autoconf/manual/html_node/Coding-Style.html

b=14714
i=scjody
---

diff --git a/ldiskfs/kernel_patches/patches/iopen-2.6-rhel4.patch b/ldiskfs/kernel_patches/patches/iopen-2.6-rhel4.patch
index 2f015bb..731ce38 100644
--- a/ldiskfs/kernel_patches/patches/iopen-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/iopen-2.6-rhel4.patch
@@ -340,7 +340,8 @@ Index: linux-stage/fs/ext3/iopen.h
 +#define d_rehash_cond(dentry, lock) __d_rehash(dentry, lock)
 +#endif
 +
-+#if !defined(HAVE_D_MOVE_LOCKED) && defined(HAVE_d_move_locked(dentry, lock) __d_move(dentry, lock)
++#if !defined(HAVE_D_MOVE_LOCKED) && defined(HAVE___D_MOVE)
++#define d_move_locked(dentry, target) __d_move(dentry, target)
 +#endif
 Index: linux-stage/fs/ext3/namei.c
 ===================================================================