From: brian <brian>
Date: Wed, 16 Sep 2009 19:57:43 +0000 (+0000)
Subject: b=18054
X-Git-Tag: v1_9_270~47
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e72678fabca2b3969e8f36eef53d13a07861b6a5

b=18054
i=brian
i=yangsheng
o=Jim Garlick,Christopher Morrone

An option to configure to use the ldiskfs that's supplied by the kernel
(i.e. that's in the kernel-devel in the case of a RH kernel RPM roll).
---

diff --git a/autoMakefile.am b/autoMakefile.am
index 37364f8..e2e94ab 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -3,19 +3,23 @@ DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
 if LDISKFS_ENABLED
+if !LDISKFS_IN_KERNEL
 EXTRA_SOURCES := @SYMVERFILE@
 endif
+endif
 
 include build/autoMakefile.am.toplevel
 
 EXTRA_DIST += config.h.in
 
 if LDISKFS_ENABLED
+if !LDISKFS_IN_KERNEL
 @SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
 	touch @SYMVERFILE@
 	-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
 	cat @SYMVERFILE@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
 endif
+endif
 
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig
diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 78b7e05..42f7e26 100644
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -202,6 +202,10 @@ AC_DEFUN([LB_PATH_LDISKFS],
 			with_ldiskfs=no
 		fi
 	])
+AC_ARG_WITH([ldiskfs-inkernel],
+	AC_HELP_STRING([--with-ldiskfs-inkernel],
+			[use ldiskfs built in to the kernel]),
+	[with_ldiskfs=inkernel], [])
 AC_MSG_CHECKING([location of ldiskfs])
 case x$with_ldiskfs in
 	xyes)
@@ -215,6 +219,12 @@ case x$with_ldiskfs in
 	xno)
 		AC_MSG_RESULT([disabled])
 		;;
+	xinkernel)
+		AC_MSG_RESULT([inkernel])
+		LB_CHECK_FILE([$LINUX/include/linux/ldiskfs_fs.h],[],[
+			AC_MSG_ERROR([ldiskfs was not found in $LINUX/include/linux/ldiskfs_fs.h])
+		])
+		;;
 	*)
 		AC_MSG_RESULT([$with_ldiskfs])
 		LB_CHECK_FILE([$with_ldiskfs/ldiskfs/linux/ldiskfs_fs.h],[],[
@@ -226,6 +236,7 @@ esac
 AC_SUBST(LDISKFS_DIR)
 AC_SUBST(LDISKFS_SUBDIR)
 AM_CONDITIONAL(LDISKFS_ENABLED, test x$with_ldiskfs != xno)
+AM_CONDITIONAL(LDISKFS_IN_KERNEL, test x$with_ldiskfs = xinkernel)
 
 if test x$enable_ext4 = xyes ; then
 	AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [build ext4 based ldiskfs])