X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=cdcd10b9f81cd2f0dff811cda1984adcde609f2c;hb=f89e5ac9ea117137d826d008b64ac3eaa625b456;hp=d821f85559800b2077c6bcd45a8f9d2afaff0c80;hpb=25c93758d6b1136d268fe3fcc1c4979c17463c0b;p=fs%2Flustre-release.git

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index d821f85..cdcd10b 100644
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -105,7 +105,7 @@ if test x$with_ldiskfs = xyes; then
 	LB_LDISKFS_RELEASE
 	LB_LDISKFS_EXT_DIR
 	LB_LDISKFS_BUILD
-	LB_LDISKFS_DEFINE_OPTIONS
+	AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
 fi
 
 #
@@ -209,30 +209,6 @@ fi
 ])
 
 #
-# LB_LDISKFS_DEFINE_OPTIONS
-#
-# Enable config options related to ldiskfs.  These are used by ldiskfs,
-# lvfs, and the osd-ldiskfs code (which includes ldiskfs headers.)
-#
-AC_DEFUN([LB_LDISKFS_DEFINE_OPTIONS],
-[
-AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
-
-AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1,
-	[enable extended attributes for ldiskfs])
-AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1,
-	[enable posix acls for ldiskfs])
-AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1,
-	[enable fs security for ldiskfs])
-AC_DEFINE(CONFIG_LDISKFSDEV_FS_POSIX_ACL, 1,
-	[enable posix acls for ldiskfs])
-AC_DEFINE(CONFIG_LDISKFSDEV_FS_XATTR, 1,
-	[enable extented attributes for ldiskfs])
-AC_DEFINE(CONFIG_LDISKFSDEV_FS_SECURITY, 1,
-	[enable fs security for ldiskfs])
-])
-
-#
 # Optionally configure/make the ldiskfs sources.  If the sources are
 # determined to reside in-tree this feature will automatically be
 # enabled.  If the sources are not in-tree it will be disabled.