[Pkg-lustre-svn-commit] updated: [fd17805] Add output of sh autogen.sh, as it currently (still) fails to run on unstable Signed-off-by: Patrick Winnertz <winnie at debian.org>

Patrick Winnertz winnie at debian.org
Wed Mar 3 17:23:13 UTC 2010


The following commit has been merged in the master branch:
commit fd1780589a1d4e7e1d1242bd0d5ba091c16858b7
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Mar 3 17:05:00 2010 +0100

    Add output of sh autogen.sh, as it currently (still) fails to run on unstable
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/00list b/debian/patches/00list
index b12e84d..9877ceb 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -27,4 +27,4 @@ fix-oot-builds.dpatch
 #lnet-missing-prototypes.dpatch
 #fix_various_typecasts.dpatch
 #build-fixes-for_2.6.18_servers.dpatch
-#autogen-run.dpatch
+autogen-run.dpatch
diff --git a/debian/patches/autogen-run.dpatch b/debian/patches/autogen-run.dpatch
index 777094a..98e8698 100755
--- a/debian/patches/autogen-run.dpatch
+++ b/debian/patches/autogen-run.dpatch
@@ -1,14 +1,14 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
+## autogen-run.dpatch by Patrick Winnertz <winnie at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: output of autogen.sh on etch, as currently the build will fail using
-## DP: the autotools of unstable.
+## DP: result of autogen.sh on lenny, as it currently fails to run on unstable
 
 @DPATCH@
-diff -Nurwd lustre-1.8.1.orig/aclocal.m4 lustre-1.8.1/aclocal.m4
---- lustre-1.8.1.orig/aclocal.m4	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/aclocal.m4	2009-09-10 11:16:50.000000000 +0200
-@@ -821,7 +821,7 @@
+diff -Nurwd orig/lustre-1.8.2/aclocal.m4 lustre-1.8.2/aclocal.m4
+--- orig/lustre-1.8.2/aclocal.m4	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/aclocal.m4	2010-03-03 16:00:08.267634057 +0000
+@@ -873,7 +873,7 @@
  	CC="$CC -m64"
  fi
  
@@ -17,7 +17,7 @@ diff -Nurwd lustre-1.8.1.orig/aclocal.m4 lustre-1.8.1/aclocal.m4
  
  LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
  AC_SUBST(LLCPPFLAGS)
-@@ -3131,6 +3131,7 @@
+@@ -3096,6 +3096,7 @@
  ])
  ])
  
@@ -25,7 +25,7 @@ diff -Nurwd lustre-1.8.1.orig/aclocal.m4 lustre-1.8.1/aclocal.m4
  #
  # LC_COOKIE_FOLLOW_LINK
  #
-@@ -5918,113 +5919,6 @@
+@@ -5944,113 +5945,6 @@
  ])
  
  #
@@ -139,10 +139,225 @@ diff -Nurwd lustre-1.8.1.orig/aclocal.m4 lustre-1.8.1/aclocal.m4
  # LS_CONFIGURE
  #
  # configure bits for lustre-snmp
-diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cache/output.0
---- lustre-1.8.1.orig/autom4te.cache/output.0	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/autom4te.cache/output.0	2009-09-10 11:16:55.000000000 +0200
-@@ -0,0 +1,21380 @@
+diff -Nurwd orig/lustre-1.8.2/autoMakefile.am lustre-1.8.2/autoMakefile.am
+--- orig/lustre-1.8.2/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/autoMakefile.am	2010-03-03 15:57:14.823633491 +0000
+@@ -4,7 +4,7 @@
+ RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
+ if LDISKFS_ENABLED
+ if !LDISKFS_IN_KERNEL
+-EXTRA_SOURCES := @SYMVERFILE@
++#EXTRA_SOURCES := @SYMVERFILE@
+ endif
+ endif
+ 
+diff -Nurwd orig/lustre-1.8.2/autoMakefile.am.~1~ lustre-1.8.2/autoMakefile.am.~1~
+--- orig/lustre-1.8.2/autoMakefile.am.~1~	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/autoMakefile.am.~1~	2010-03-03 15:57:14.823633491 +0000
+@@ -0,0 +1,47 @@
++SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
++DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre 
++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 debian/*
++
++if LDISKFS_ENABLED
++if !LDISKFS_IN_KERNEL
++ at SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
++	touch @SYMVERFILE@
++	-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE at .old
++	cat @SYMVERFILE at .old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
++endif
++endif
++
++CSTK=/tmp/checkstack
++CSTKO=/tmp/checkstack.orig
++
++checkstack:
++	[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
++	{ for MOD in $$(find . -name "*.ko"); do			     \
++		objdump -d $$MOD | perl build/checkstack.pl;                 \
++	  done } | grep -v " bug " | sort -nr | uniq > ${CSTK}
++	[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
++
++checkstack-update:
++	[ -f ${CSTK} ] && mv -f ${CSTK} ${CSTKO}
++
++checkstack-clean:
++	rm -f ${CSTK} ${CSTKO}
++
++module-dist-hook:
++	if [ -d CVS -o -d .git ]; then \
++	    perl lustre/scripts/tree_status.pl > $(distdir)/tree_status; \
++	elif [ -f tree_status ]; then \
++	    cp tree_status $(distdir)/tree_status; \
++	else \
++	    echo -e "I have no idea how to create a tree_status file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
++	fi
+diff -Nurwd orig/lustre-1.8.2/autoMakefile.in lustre-1.8.2/autoMakefile.in
+--- orig/lustre-1.8.2/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/autoMakefile.in	2010-03-03 16:00:10.711632658 +0000
+@@ -122,12 +122,11 @@
+ EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
+ EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
+-EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
+-EXTRA_KLIBS = @EXTRA_KLIBS@
+ EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
+ GMCPPFLAGS = @GMCPPFLAGS@
+ GMLIBS = @GMLIBS@
+ GMLND = @GMLND@
++GREP = @GREP@
+ IIBCPPFLAGS = @IIBCPPFLAGS@
+ IIBLND = @IIBLND@
+ INCLUDE_RULES = @INCLUDE_RULES@
+@@ -243,8 +242,6 @@
+ ZLIB = @ZLIB@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ agentdir = @agentdir@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+@@ -258,8 +255,10 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ demodir = @demodir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ enable_uoss = @enable_uoss@
+ exec_prefix = @exec_prefix@
+ host = @host@
+@@ -267,26 +266,27 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kextdir = @kextdir@
+ lb_target_os = @lb_target_os@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+-macosdir = @macosdir@
+ mandir = @mandir@
+ mibdir = @mibdir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgexampledir = @pkgexampledir@
+-plistdir = @plistdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ rootsbindir = @rootsbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+@@ -301,7 +301,6 @@
+ DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre 
+ SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
+ RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
+- at LDISKFS_ENABLED_TRUE@@LDISKFS_IN_KERNEL_FALSE at EXTRA_SOURCES := @SYMVERFILE@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+@@ -314,6 +313,7 @@
+ 
+ @LINUX25_FALSE@@LINUX_TRUE@@MODULES_TRUE at CLEANFILES = .depend
+ 
++#EXTRA_SOURCES := @SYMVERFILE@
+ EXTRA_DIST = @PACKAGE_TARNAME at .spec					\
+ 	build/Makefile build/autoMakefile.am.toplevel build/lbuild	\
+ 	build/linux-merge-config.awk build/linux-merge-modules.awk	\
+@@ -336,6 +336,8 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = Makefile Rules lustre.spec \
++	lnet/include/libcfs/darwin/Makefile \
++	lnet/include/lnet/darwin/Makefile lnet/libcfs/darwin/Makefile \
+ 	lustre/kernel_patches/targets/2.6-suse.target \
+ 	lustre/kernel_patches/targets/2.6-vanilla.target \
+ 	lustre/kernel_patches/targets/2.6-rhel4.target \
+@@ -349,7 +351,8 @@
+ 	lustre/kernel_patches/targets/rhel-2.4.target \
+ 	lustre/kernel_patches/targets/suse-2.4.21-2.target \
+ 	lustre/kernel_patches/targets/sles-2.4.target \
+-	lustre/kernel_patches/targets/2.6-oel5.target
++	lustre/kernel_patches/targets/2.6-oel5.target \
++	lustre/obdclass/darwin/Makefile
+ DIST_SOURCES =
+ 
+ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+@@ -360,8 +363,9 @@
+ DIST_COMMON = README $(srcdir)/autoMakefile.in \
+ 	$(srcdir)/build/autoMakefile.am.toplevel $(srcdir)/configure \
+ 	COPYING ChangeLog Makefile.in aclocal.m4 autoMakefile.am \
+-	compile config.guess config.h.in config.sub configure.ac \
+-	depcomp install-sh lustre.spec.in missing mkinstalldirs
++	compile config.guess config.h.in config.sub configure \
++	configure.ac depcomp install-sh lustre.spec.in missing \
++	mkinstalldirs
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+@@ -405,6 +409,12 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ lustre.spec: $(top_builddir)/config.status lustre.spec.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
++lnet/include/libcfs/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/include/libcfs/darwin/Makefile.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
++lnet/include/lnet/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/include/lnet/darwin/Makefile.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
++lnet/libcfs/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/libcfs/darwin/Makefile.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
+ lustre/kernel_patches/targets/2.6-suse.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/2.6-suse.target.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ lustre/kernel_patches/targets/2.6-vanilla.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/2.6-vanilla.target.in
+@@ -433,6 +443,8 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ lustre/kernel_patches/targets/2.6-oel5.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/2.6-oel5.target.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
++lustre/obdclass/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lustre/obdclass/darwin/Makefile.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
+ uninstall-info-am:
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -546,7 +558,7 @@
+ distdir: $(DISTFILES)
+ 	$(am__remove_distdir)
+ 	mkdir $(distdir)
+-	$(mkinstalldirs) $(distdir)/. $(distdir)/./build $(distdir)/build $(distdir)/build/autoconf $(distdir)/debian $(distdir)/lnet $(distdir)/lnet/klnds $(distdir)/lnet/klnds/ciblnd $(distdir)/lnet/klnds/gmlnd $(distdir)/lnet/klnds/iiblnd $(distdir)/lnet/klnds/mxlnd $(distdir)/lnet/klnds/o2iblnd $(distdir)/lnet/klnds/openiblnd $(distdir)/lnet/klnds/ptllnd $(distdir)/lnet/klnds/qswlnd $(distdir)/lnet/klnds/ralnd $(distdir)/lnet/klnds/socklnd $(distdir)/lnet/klnds/viblnd $(distdir)/lnet/libcfs $(distdir)/lnet/lnet $(distdir)/lnet/selftest $(distdir)/lnet/ulnds $(distdir)/lustre $(distdir)/lustre/include $(distdir)/lustre/kernel_patches/targets $(distdir)/lustre/llite $(distdir)/lustre/lov $(distdir)/lustre/lvfs $(distdir)/lustre/mdc $(distdir)/lustre/mds $(distdir)/lustre/mgc $(distdir)/lustre/mgs $(distdir)/lustre/obdclass $(distdir)/lustre/obdecho $(distdir)/lustre/obdfilter $(distdir)/lustre/osc $(distdir)/lustre/ost $(distdir)/lustre/ptlrpc $(distdir)/lustre/quota
++	$(mkinstalldirs) $(distdir)/. $(distdir)/./build $(distdir)/build $(distdir)/build/autoconf $(distdir)/debian $(distdir)/lnet $(distdir)/lnet/include/libcfs/darwin $(distdir)/lnet/include/lnet/darwin $(distdir)/lnet/klnds $(distdir)/lnet/klnds/ciblnd $(distdir)/lnet/klnds/gmlnd $(distdir)/lnet/klnds/iiblnd $(distdir)/lnet/klnds/mxlnd $(distdir)/lnet/klnds/o2iblnd $(distdir)/lnet/klnds/openiblnd $(distdir)/lnet/klnds/ptllnd $(distdir)/lnet/klnds/qswlnd $(distdir)/lnet/klnds/ralnd $(distdir)/lnet/klnds/socklnd $(distdir)/lnet/klnds/viblnd $(distdir)/lnet/libcfs $(distdir)/lnet/libcfs/darwin $(distdir)/lnet/lnet $(distdir)/lnet/selftest $(distdir)/lnet/ulnds $(distdir)/lustre $(distdir)/lustre/include $(distdir)/lustre/kernel_patches/targets $(distdir)/lustre/llite $(distdir)/lustre/lov $(distdir)/lustre/lvfs $(distdir)/lustre/mdc $(distdir)/lustre/mds $(distdir)/lustre/mgc $(distdir)/lustre/mgs $(distdir)/lustre/obdclass $(distdir)/lustre/obdclass/darwin $(distdir)/lustre/obdecho $(distdir)/lustre/obdfilter $(distdir)/lustre/osc $(distdir)/lustre/ost $(distdir)/lustre/ptlrpc $(distdir)/lustre/quota
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+diff -Nurwd orig/lustre-1.8.2/autogen.sh lustre-1.8.2/autogen.sh
+--- orig/lustre-1.8.2/autogen.sh	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/autogen.sh	2010-03-03 15:57:14.815634149 +0000
+@@ -0,0 +1,2 @@
++#!/bin/sh
++exec bash build/autogen.sh $@ 
+diff -Nurwd orig/lustre-1.8.2/autom4te.cache/output.0 lustre-1.8.2/autom4te.cache/output.0
+--- orig/lustre-1.8.2/autom4te.cache/output.0	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/autom4te.cache/output.0	2010-03-03 16:00:10.092633453 +0000
+@@ -0,0 +1,21595 @@
 +@%:@! /bin/sh
 +@%:@ Guess values for system-dependent variables and create Makefiles.
 +@%:@ Generated by GNU Autoconf 2.61 for Lustre LUSTRE_VERSION.
@@ -918,9 +1133,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +BACKINGFS
 +DMU_SRC
 +subdirs
++SPL_SUBDIR
++ZFS_SUBDIR
 +SPL_DIR
 +ZFS_DIR
-+spl_src
 +DMU_OSD_ENABLED_TRUE
 +DMU_OSD_ENABLED_FALSE
 +KDMU_TRUE
@@ -929,6 +1145,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +SNMP_SUBDIR
 +LDISKFS_DIR
 +LDISKFS_SUBDIR
++LDISKFS_IN_KERNEL_TRUE
++LDISKFS_IN_KERNEL_FALSE
 +LUSTREIOKIT_SUBDIR
 +MPICC_WRAPPER
 +LIBREADLINE
@@ -1639,6 +1857,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +                          disable ptlrpc adaptive timeouts support
 +  --enable-delayed-recovery 
 +                          enable late recovery after main one
++  --enable-ext4           enable building of ldiskfs based on ext4
 +  --enable-dmu            enable the DMU backend
 +  --disable-liblustre     disable building of Lustre library
 +  --enable-liblustre-tests 
@@ -1686,6 +1905,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +                          libsysio)
 +  --with-ldiskfs=path     set path to ldiskfs source (default is included
 +                          ldiskfs)
++  --with-ldiskfs-inkernel use ldiskfs built in to the kernel
 +  --with-lustre-iokit=path 
 +                          set path to lustre-iokit source (default is included
 +                          lustre-iokit)
@@ -2158,16 +2378,16 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +
 +AC_LUSTRE_MAJOR=1
 +AC_LUSTRE_MINOR=8
-+AC_LUSTRE_PATCH=1
++AC_LUSTRE_PATCH=2
 +AC_LUSTRE_FIX=0
-+AC_LUSTRE_VERSION_STRING=1.8.1
++AC_LUSTRE_VERSION_STRING=1.8.2
 +AC_LUSTRE_VER_ALLOWED_OFFSET="OBD_OCD_VERSION(0,0,1,32)"
 +AC_LUSTRE_LIB_VER_OFFSET_WARN="OBD_OCD_VERSION(0,0,1,32)"
 +AC_LUSTRE_CLI_VER_OFFSET_WARN="OBD_OCD_VERSION(0,2,0,0)"
-+AC_LUSTRE_CLIENT_URN="LUSTRE-181-CLT"
-+AC_LUSTRE_MGS_URN="LUSTRE-181-MGS"
-+AC_LUSTRE_MDS_URN="LUSTRE-181-MDS"
-+AC_LUSTRE_OSS_URN="LUSTRE-181-OSS"
++AC_LUSTRE_CLIENT_URN="LUSTRE-182-CLT"
++AC_LUSTRE_MGS_URN="LUSTRE-182-MGS"
++AC_LUSTRE_MDS_URN="LUSTRE-182-MDS"
++AC_LUSTRE_OSS_URN="LUSTRE-182-OSS"
 +
 +
 +
@@ -2195,7 +2415,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +
 +
-+if test "1.8.1" = "LUSTRE""_VERSION" ; then
++if test "1.8.2" = "LUSTRE""_VERSION" ; then
 +	{ { echo "$as_me:$LINENO: error: This script was not built with a version number." >&5
 +echo "$as_me: error: This script was not built with a version number." >&2;}
 +   { (exit 1); exit 1; }; }
@@ -2625,7 +2845,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +
 +# Define the identity of the package.
 + PACKAGE='lustre'
-+ VERSION='1.8.1'
++ VERSION='1.8.2'
 +
 +
 +cat >>confdefs.h <<_ACEOF
@@ -5888,7 +6108,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d $makerule LUSTRE_KERNEL_TEST=conftest.i ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d $makerule LUSTRE_KERNEL_TEST=conftest.i ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -5927,7 +6147,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d $makerule LUSTRE_KERNEL_TEST=conftest.i ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d $makerule LUSTRE_KERNEL_TEST=conftest.i ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -5985,7 +6205,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6051,7 +6271,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
 +if { ac_try='cp conftest.c build && make -d 
 +	$makerule LUSTRE_KERNEL_TEST=conftest.i
-+ ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++ ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6136,7 +6356,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6189,7 +6409,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6273,7 +6493,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6331,7 +6551,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6385,7 +6605,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6445,7 +6665,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6584,7 +6804,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6638,7 +6858,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6692,7 +6912,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6764,7 +6984,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6912,7 +7132,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -6961,7 +7181,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -7094,7 +7314,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -7157,7 +7377,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -7288,7 +7508,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -7401,7 +7621,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -7513,7 +7733,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -7580,7 +7800,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -7689,7 +7909,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -7834,7 +8054,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -7932,7 +8152,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -7992,7 +8212,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8052,7 +8272,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8111,7 +8331,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8170,7 +8390,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8243,7 +8463,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8412,7 +8632,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8483,7 +8703,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8538,7 +8758,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8641,7 +8861,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8809,7 +9029,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8865,7 +9085,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -8964,7 +9184,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9019,7 +9239,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9076,7 +9296,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9131,7 +9351,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9190,7 +9410,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9246,7 +9466,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9303,7 +9523,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9343,6 +9563,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +
++        #include <asm/types.h>
 +        #include <linux/scatterlist.h>
 +
 +int
@@ -9357,7 +9578,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9414,7 +9635,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9469,7 +9690,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9524,8 +9745,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +    	
 +	tmp_flags="$EXTRA_KCFLAGS"
 +	EXTRA_KCFLAGS="-Werror"
-+	{ echo "$as_me:$LINENO: checking whether we can really use dump_stack" >&5
-+echo $ECHO_N "checking whether we can really use dump_stack... $ECHO_C" >&6; }
++	{ echo "$as_me:$LINENO: checking whether we can really use dump_trace" >&5
++echo $ECHO_N "checking whether we can really use dump_trace... $ECHO_C" >&6; }
 +	cat >conftest.c <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -9548,7 +9769,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9606,7 +9827,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9645,8 +9866,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +    
 +	tmp_flags="$EXTRA_KCFLAGS"
 +	EXTRA_KCFLAGS="-Werror"
-+	{ echo "$as_me:$LINENO: checking whether we can really use dump_stack" >&5
-+echo $ECHO_N "checking whether we can really use dump_stack... $ECHO_C" >&6; }
++	{ echo "$as_me:$LINENO: checking whether we can really use dump_trace" >&5
++echo $ECHO_N "checking whether we can really use dump_trace... $ECHO_C" >&6; }
 +	cat >conftest.c <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -9669,7 +9890,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9727,7 +9948,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9762,14 +9983,13 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +
 +
-+
-+			as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/lustre_version.h" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $LINUX/include/linux/lustre_version.h" >&5
-+echo $ECHO_N "checking for $LINUX/include/linux/lustre_version.h... $ECHO_C" >&6; }
++as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/cred.h" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $LINUX/include/linux/cred.h" >&5
++echo $ECHO_N "checking for $LINUX/include/linux/cred.h... $ECHO_C" >&6; }
 +if { as_var=$as_lb_File; eval "test \"\${$as_var+set}\" = set"; }; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
-+  if test -r "$LINUX/include/linux/lustre_version.h"; then
++  if test -r "$LINUX/include/linux/cred.h"; then
 +  eval "$as_lb_File=yes"
 +else
 +  eval "$as_lb_File=no"
@@ -9780,56 +10000,23 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_lb_File'}'` = yes; then
 +  
-+	rm -f "$LUSTRE/include/linux/lustre_version.h"
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_LINUX_CRED_H 1
++_ACEOF
++
 +
 +else
 +  
-+	touch "$LUSTRE/include/linux/lustre_version.h"
-+	if test x$enable_server = xyes ; then
-+        	{ echo "$as_me:$LINENO: WARNING: Unpatched kernel detected." >&5
-+echo "$as_me: WARNING: Unpatched kernel detected." >&2;}
-+        	{ echo "$as_me:$LINENO: WARNING: Lustre servers cannot be built with an unpatched kernel;" >&5
-+echo "$as_me: WARNING: Lustre servers cannot be built with an unpatched kernel;" >&2;}
-+        	{ echo "$as_me:$LINENO: WARNING: disabling server build" >&5
-+echo "$as_me: WARNING: disabling server build" >&2;}
-+        	enable_server='no'
-+	fi
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
 +
 +fi
 +
-+	if test x$enable_server = xyes ; then
-+		if test x$RHEL_KERNEL = xyes -a x$LINUXRELEASE != x${LINUXRELEASE##2.6.9} ; then
-+        		{ echo "$as_me:$LINENO: WARNING: Lustre server has been disabled with rhel4 kernel;" >&5
-+echo "$as_me: WARNING: Lustre server has been disabled with rhel4 kernel;" >&2;}
-+        		{ echo "$as_me:$LINENO: WARNING: disabling server build" >&5
-+echo "$as_me: WARNING: disabling server build" >&2;}
-+        		enable_server='no'
-+		fi
-+		if test x$SUSE_KERNEL = xyes -a x$LINUXRELEASE != x${LINUXRELEASE##2.6.5} ; then
-+        		{ echo "$as_me:$LINENO: WARNING: Lustre server has been disabled with sles9 kernel;" >&5
-+echo "$as_me: WARNING: Lustre server has been disabled with sles9 kernel;" >&2;}
-+        		{ echo "$as_me:$LINENO: WARNING: disabling server build" >&5
-+echo "$as_me: WARNING: disabling server build" >&2;}
-+			enable_server='no'
-+		fi
-+	fi
-+
-+          if test x$enable_server = xyes ; then
-+              
-+BACKINGFS="ldiskfs"
 +
-+if test x$with_ldiskfs = xno ; then
-+	BACKINGFS="ext3"
-+
-+	if test x$enable_server = xyes ; then
-+		{ { echo "$as_me:$LINENO: error: ldiskfs is required for 2.6-based servers." >&5
-+echo "$as_me: error: ldiskfs is required for 2.6-based servers." >&2;}
-+   { (exit 1); exit 1; }; }
-+	fi
-+
-+	# --- Check that ext3 and ext3 xattr are enabled in the kernel
-+	{ echo "$as_me:$LINENO: checking if Linux was built with CONFIG_EXT3_FS" >&5
-+echo $ECHO_N "checking if Linux was built with CONFIG_EXT3_FS... $ECHO_C" >&6; }
++#2.6.29
++{ echo "$as_me:$LINENO: checking if kernel has struct cred" >&5
++echo $ECHO_N "checking if kernel has struct cred... $ECHO_C" >&6; }
 +cat >conftest.c <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -9837,15 +10024,14 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +
-+#include <linux/autoconf.h>
++	#include <linux/sched.h>
 +
 +int
 +main (void)
 +{
 +
-+#ifndef CONFIG_EXT3_FS
-+#error CONFIG_EXT3_FS not #defined
-+#endif
++	struct task_struct *tsk = NULL;
++	tsk->real_cred = NULL;
 +
 +  ;
 +  return 0;
@@ -9853,7 +10039,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9865,8 +10051,12 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  
-+{ echo "$as_me:$LINENO: result: yes" >&5
++	{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_CRED 1
++_ACEOF
 +
 +
 +else
@@ -9874,11 +10064,17 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
-+{ echo "$as_me:$LINENO: result: no" >&5
++	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +
-+	{ echo "$as_me:$LINENO: checking if Linux was built with CONFIG_EXT3_FS_MODULE" >&5
-+echo $ECHO_N "checking if Linux was built with CONFIG_EXT3_FS_MODULE... $ECHO_C" >&6; }
++fi
++rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++
++# 2.6.30
++{ echo "$as_me:$LINENO: checking if kernel defines unshare_fs_struct()" >&5
++echo $ECHO_N "checking if kernel defines unshare_fs_struct()... $ECHO_C" >&6; }
++tmp_flags="$EXTRA_KCFLAGS"
++EXTRA_KCFLAGS="-Werror"
 +cat >conftest.c <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -9886,15 +10082,14 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +
-+#include <linux/autoconf.h>
++	#include <linux/sched.h>
++	#include <linux/fs_struct.h>
 +
 +int
 +main (void)
 +{
 +
-+#ifndef CONFIG_EXT3_FS_MODULE
-+#error CONFIG_EXT3_FS_MODULE not #defined
-+#endif
++	unshare_fs_struct();
 +
 +  ;
 +  return 0;
@@ -9902,7 +10097,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9914,8 +10109,12 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  
-+{ echo "$as_me:$LINENO: result: yes" >&5
++	{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_UNSHARE_FS_STRUCT 1
++_ACEOF
 +
 +
 +else
@@ -9923,24 +10122,68 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
-+{ echo "$as_me:$LINENO: result: no" >&5
++	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +
-+		{ { echo "$as_me:$LINENO: error: Lustre requires that ext3 is enabled in the kernel" >&5
-+echo "$as_me: error: Lustre requires that ext3 is enabled in the kernel" >&2;}
-+   { (exit 1); exit 1; }; }
-+	
-+
 +fi
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++EXTRA_KCFLAGS="$tmp_flags"
++
 +
++			as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/lustre_version.h" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $LINUX/include/linux/lustre_version.h" >&5
++echo $ECHO_N "checking for $LINUX/include/linux/lustre_version.h... $ECHO_C" >&6; }
++if { as_var=$as_lb_File; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -r "$LINUX/include/linux/lustre_version.h"; then
++  eval "$as_lb_File=yes"
++else
++  eval "$as_lb_File=no"
++fi
++fi
++ac_res=`eval echo '${'$as_lb_File'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_lb_File'}'` = yes; then
++  
++	rm -f "$LUSTRE/include/linux/lustre_version.h"
 +
++else
++  
++	touch "$LUSTRE/include/linux/lustre_version.h"
++	if test x$enable_server = xyes ; then
++        	{ echo "$as_me:$LINENO: WARNING: Unpatched kernel detected." >&5
++echo "$as_me: WARNING: Unpatched kernel detected." >&2;}
++        	{ echo "$as_me:$LINENO: WARNING: Lustre servers cannot be built with an unpatched kernel;" >&5
++echo "$as_me: WARNING: Lustre servers cannot be built with an unpatched kernel;" >&2;}
++        	{ echo "$as_me:$LINENO: WARNING: disabling server build" >&5
++echo "$as_me: WARNING: disabling server build" >&2;}
++        	enable_server='no'
++	fi
 +
 +fi
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
 +
-+{ echo "$as_me:$LINENO: checking if Linux was built with CONFIG_EXT3_FS_XATTR" >&5
-+echo $ECHO_N "checking if Linux was built with CONFIG_EXT3_FS_XATTR... $ECHO_C" >&6; }
++	if test x$enable_server = xyes ; then
++		if test x$RHEL_KERNEL = xyes -a x$LINUXRELEASE != x${LINUXRELEASE##2.6.9} ; then
++        		{ echo "$as_me:$LINENO: WARNING: Lustre server has been disabled with rhel4 kernel;" >&5
++echo "$as_me: WARNING: Lustre server has been disabled with rhel4 kernel;" >&2;}
++        		{ echo "$as_me:$LINENO: WARNING: disabling server build" >&5
++echo "$as_me: WARNING: disabling server build" >&2;}
++        		enable_server='no'
++		fi
++		if test x$SUSE_KERNEL = xyes -a x$LINUXRELEASE != x${LINUXRELEASE##2.6.5} ; then
++        		{ echo "$as_me:$LINENO: WARNING: Lustre server has been disabled with sles9 kernel;" >&5
++echo "$as_me: WARNING: Lustre server has been disabled with sles9 kernel;" >&2;}
++        		{ echo "$as_me:$LINENO: WARNING: disabling server build" >&5
++echo "$as_me: WARNING: disabling server build" >&2;}
++			enable_server='no'
++		fi
++	fi
++
++          if test x$enable_server = xyes ; then
++              { echo "$as_me:$LINENO: checking if kernel has new dev_set_rdonly" >&5
++echo $ECHO_N "checking if kernel has new dev_set_rdonly... $ECHO_C" >&6; }
 +cat >conftest.c <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -9948,15 +10191,16 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +
-+#include <linux/autoconf.h>
++        #include <linux/fs.h>
++        #include <linux/blkdev.h>
 +
 +int
 +main (void)
 +{
 +
-+#ifndef CONFIG_EXT3_FS_XATTR
-+#error CONFIG_EXT3_FS_XATTR not #defined
-+#endif
++        #ifndef HAVE_CLEAR_RDONLY_ON_PUT
++        #error needs to be patched by lustre kernel patches from Lustre version 1.4.3 or above.
++        #endif
 +
 +  ;
 +  return 0;
@@ -9964,7 +10208,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -9976,8 +10220,12 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  
-+{ echo "$as_me:$LINENO: result: yes" >&5
++        { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_DEV_SET_RDONLY 1
++_ACEOF
 +
 +
 +else
@@ -9985,19 +10233,24 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
-+{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+		{ echo "$as_me:$LINENO: WARNING: Lustre requires that extended attributes for ext3 are enabled in the kernel" >&5
-+echo "$as_me: WARNING: Lustre requires that extended attributes for ext3 are enabled in the kernel" >&2;}
-+		{ echo "$as_me:$LINENO: WARNING: This build may fail." >&5
-+echo "$as_me: WARNING: This build may fail." >&2;}
-+	
++        { { echo "$as_me:$LINENO: error: no, Linux kernel source needs to be patches by lustre 
++kernel patches from Lustre version 1.4.3 or above." >&5
++echo "$as_me: error: no, Linux kernel source needs to be patches by lustre 
++kernel patches from Lustre version 1.4.3 or above." >&2;}
++   { (exit 1); exit 1; }; }
 +
 +fi
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
 +
++              
++BACKINGFS="ldiskfs"
 +
++if test x$with_ldiskfs = xno ; then
++	if test x$enable_server = xyes ; then
++		{ { echo "$as_me:$LINENO: error: ldiskfs is required for 2.6-based servers." >&5
++echo "$as_me: error: ldiskfs is required for 2.6-based servers." >&2;}
++   { (exit 1); exit 1; }; }
++	fi
 +else
 +	# ldiskfs is enabled
 +	
@@ -10036,12 +10289,6 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +@%:@define CONFIG_LDISKFSDEV_FS_SECURITY 1
 +_ACEOF
 +
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define CONFIG_LDISKFS_FS_NFS4ACL 1
-+_ACEOF
-+
-+
 +
 +fi #ldiskfs
 +
@@ -10076,7 +10323,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -10263,7 +10510,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -10305,62 +10552,6 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +
 +
-+          { echo "$as_me:$LINENO: checking task p_pptr found" >&5
-+echo $ECHO_N "checking task p_pptr found... $ECHO_C" >&6; }
-+cat >conftest.c <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+	#include <linux/sched.h>
-+
-+int
-+main (void)
-+{
-+
-+	struct task_struct *p;
-+	
-+	p = p->p_pptr;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_TASK_PPTR 1
-+_ACEOF
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+fi
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-+
 +          # RHEL4 patches
 +          { echo "$as_me:$LINENO: checking if Linux was built with symbol truncate_complete_page exported" >&5
 +echo $ECHO_N "checking if Linux was built with symbol truncate_complete_page exported... $ECHO_C" >&6; }
@@ -10735,7 +10926,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +
 +          { echo "$as_me:$LINENO: checking if releasepage has a gfp_t parameter" >&5
 +echo $ECHO_N "checking if releasepage has a gfp_t parameter... $ECHO_C" >&6; }
-+RELEASEPAGE_WITH_GFP="`grep -c 'releasepage.*gfp_t' $LINUX/include/linux/fs.h`"
++RELEASEPAGE_WITH_GFP="$(grep -c 'releasepage.*gfp_t' $LINUX/include/linux/fs.h)"
 +if test "$RELEASEPAGE_WITH_GFP" != 0 ; then
 +	
 +cat >>confdefs.h <<\_ACEOF
@@ -10749,8 +10940,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +echo "${ECHO_T}no" >&6; }
 +fi
 +
-+          { echo "$as_me:$LINENO: checking if kernel has mm_inline.h header" >&5
-+echo $ECHO_N "checking if kernel has mm_inline.h header... $ECHO_C" >&6; }
++          { echo "$as_me:$LINENO: checking if ldiskfs has xattr.h header" >&5
++echo $ECHO_N "checking if ldiskfs has xattr.h header... $ECHO_C" >&6; }
++tmp_flags="$EXTRA_KCFLAGS"
++EXTRA_KCFLAGS="-I$LINUX/fs -I$LDISKFS_DIR -I$LDISKFS_DIR/ldiskfs"
 +cat >conftest.c <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -10758,71 +10951,15 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +
-+	#include <linux/mm_inline.h>
++	#include <ldiskfs/xattr.h>
 +
 +int
 +main (void)
 +{
 +
-+	#ifndef page_count
-+	#error mm_inline.h does not define page_count
-+	#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_MM_INLINE 1
-+_ACEOF
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+fi
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-+
-+          { echo "$as_me:$LINENO: checking if struct inode has i_alloc_sem" >&5
-+echo $ECHO_N "checking if struct inode has i_alloc_sem... $ECHO_C" >&6; }
-+cat >conftest.c <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
++        ldiskfs_xattr_get(NULL, 0, "", NULL, 0);
++        ldiskfs_xattr_set_handle(NULL, NULL, 0, "", NULL, 0, 0);
 +
-+	#include <linux/fs.h>
-+	#include <linux/version.h>
-+
-+int
-+main (void)
-+{
-+
-+	struct inode i;
-+	return (char *)&i.i_alloc_sem - (char *)&i;
 +
 +  ;
 +  return 0;
@@ -10830,7 +10967,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -10846,7 +10983,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +echo "${ECHO_T}yes" >&6; }
 +	
 +cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_I_ALLOC_SEM 1
++@%:@define HAVE_LDISKFS_XATTR_H 1
 +_ACEOF
 +
 +
@@ -10860,303 +10997,91 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +
 +fi
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++EXTRA_KCFLAGS="$tmp_flags"
 +
-+          { echo "$as_me:$LINENO: checking if kernel defines cache pressure hook" >&5
-+echo $ECHO_N "checking if kernel defines cache pressure hook... $ECHO_C" >&6; }
-+cat >conftest.c <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+	#include <linux/mm.h>
-+
-+int
-+main (void)
-+{
-+
-+	shrinker_t shrinker;
-+
-+	set_shrinker(1, shrinker);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  
-+	{ echo "$as_me:$LINENO: result: set_shrinker" >&5
-+echo "${ECHO_T}set_shrinker" >&6; }
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_SHRINKER_CACHE 1
-+_ACEOF
-+
-+	
++          { echo "$as_me:$LINENO: checking if Linux was built with symbol grab_cache_page_nowait_gfp exported" >&5
++echo $ECHO_N "checking if Linux was built with symbol grab_cache_page_nowait_gfp exported... $ECHO_C" >&6; }
++grep -q -E '[[:space:]]grab_cache_page_nowait_gfp[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
++rc=$?
++if test $rc -ne 0; then
++    export=0
++    for file in mm/filemap.c; do
++    	grep -q -E "EXPORT_SYMBOL.*\(grab_cache_page_nowait_gfp\)" "$LINUX/$file" 2>/dev/null
++    	rc=$?
++	if test $rc -eq 0; then
++		export=1
++		break;
++	fi
++    done
++    if test $export -eq 0; then
++    	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++    	{ echo "$as_me:$LINENO: checking if Linux was built with symbol add_to_page_cache_lru exported" >&5
++echo $ECHO_N "checking if Linux was built with symbol add_to_page_cache_lru exported... $ECHO_C" >&6; }
++grep -q -E '[[:space:]]add_to_page_cache_lru[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
++rc=$?
++if test $rc -ne 0; then
++    export=0
++    for file in mm/filemap.c; do
++    	grep -q -E "EXPORT_SYMBOL.*\(add_to_page_cache_lru\)" "$LINUX/$file" 2>/dev/null
++    	rc=$?
++	if test $rc -eq 0; then
++		export=1
++		break;
++	fi
++    done
++    if test $export -eq 0; then
++    	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++    	
++        
++    else
++    	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++    	
++                
 +cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_CACHE_RETURN_INT 1
++@%:@define HAVE_ADD_TO_PAGE_CACHE_LRU 1
 +_ACEOF
 +
-+
++        
++    fi
 +else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+	cat >conftest.c <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+		#include <linux/list.h>
-+		#include <linux/cache_def.h>
-+	
-+int
-+main (void)
-+{
-+
-+		struct cache_definition cache;
-+	
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  
-+		{ echo "$as_me:$LINENO: result: register_cache" >&5
-+echo "${ECHO_T}register_cache" >&6; }
-+		
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_REGISTER_CACHE 1
-+_ACEOF
-+
-+		{ echo "$as_me:$LINENO: checking if kernel expects return from cache shrink " >&5
-+echo $ECHO_N "checking if kernel expects return from cache shrink ... $ECHO_C" >&6; }
-+		tmp_flags="$EXTRA_KCFLAGS"
-+		EXTRA_KCFLAGS="-Werror"
-+		cat >conftest.c <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+			#include <linux/list.h>
-+			#include <linux/cache_def.h>
-+		
-+int
-+main (void)
-+{
-+
-+			struct cache_definition c;
-+			c.shrinker = (int (*)(int, unsigned int))1;
-+		
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  
-+			
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_CACHE_RETURN_INT 1
-+_ACEOF
-+
-+			{ echo "$as_me:$LINENO: result: yes" >&5
++    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+		
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+			{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+		
-+fi
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-+		EXTRA_KCFLAGS="$tmp_flags"
-+	
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+		{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+	
-+fi
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-+
-+fi
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-+
-+          { echo "$as_me:$LINENO: checking if kernel defines grab_cache_page_nowait_gfp()" >&5
-+echo $ECHO_N "checking if kernel defines grab_cache_page_nowait_gfp()... $ECHO_C" >&6; }
-+HAVE_GCPN_GFP="`grep -c 'grab_cache_page_nowait_gfp' $LINUX/include/linux/pagemap.h`"
-+if test "$HAVE_GCPN_GFP" != 0 ; then
-+	
++    
++                
 +cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP 1
++@%:@define HAVE_ADD_TO_PAGE_CACHE_LRU 1
 +_ACEOF
 +
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++        
 +fi
 +
-+          { echo "$as_me:$LINENO: checking if kernel has new dev_set_rdonly" >&5
-+echo $ECHO_N "checking if kernel has new dev_set_rdonly... $ECHO_C" >&6; }
-+cat >conftest.c <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+        #include <linux/fs.h>
-+
-+int
-+main (void)
-+{
-+
-+        #ifndef HAVE_CLEAR_RDONLY_ON_PUT
-+        #error needs to be patched by lustre kernel patches from Lustre version 1.4.3 or above.
-+        #endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  
-+        { echo "$as_me:$LINENO: result: yes" >&5
++        
++    else
++    	{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
++    	
 +        
 +cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_DEV_SET_RDONLY 1
++@%:@define HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP 1
 +_ACEOF
 +
-+
++        
++    fi
 +else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+        { echo "$as_me:$LINENO: result: no, Linux kernel source needs to be patches by lustre 
-+kernel patches from Lustre version 1.4.3 or above." >&5
-+echo "${ECHO_T}no, Linux kernel source needs to be patches by lustre 
-+kernel patches from Lustre version 1.4.3 or above." >&6; }
-+
-+fi
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-+
-+          { echo "$as_me:$LINENO: checking whether filemap_fdatawrite() is defined" >&5
-+echo $ECHO_N "checking whether filemap_fdatawrite() is defined... $ECHO_C" >&6; }
-+cat >conftest.c <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+	#include <linux/fs.h>
-+
-+int
-+main (void)
-+{
-+
-+	int (*foo)(struct address_space *)= filemap_fdatawrite;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  
-+	{ echo "$as_me:$LINENO: result: yes" >&5
++    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+	
++    
++        
 +cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_FILEMAP_FDATAWRITE 1
++@%:@define HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP 1
 +_ACEOF
 +
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
++        
 +fi
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++
 +
 +          { echo "$as_me:$LINENO: checking if struct statfs has a f_namelen field" >&5
 +echo $ECHO_N "checking if struct statfs has a f_namelen field... $ECHO_C" >&6; }
@@ -11182,7 +11107,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -11213,115 +11138,6 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
 +
-+          { echo "$as_me:$LINENO: checking if kernel offers page_mapped" >&5
-+echo $ECHO_N "checking if kernel offers page_mapped... $ECHO_C" >&6; }
-+cat >conftest.c <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+	#include <linux/mm.h>
-+
-+int
-+main (void)
-+{
-+
-+	page_mapped(NULL);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_PAGE_MAPPED 1
-+_ACEOF
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+fi
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-+
-+          { echo "$as_me:$LINENO: checking if struct file_operations has an unlocked_ioctl field" >&5
-+echo $ECHO_N "checking if struct file_operations has an unlocked_ioctl field... $ECHO_C" >&6; }
-+cat >conftest.c <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+        #include <linux/fs.h>
-+
-+int
-+main (void)
-+{
-+
-+        struct file_operations fops;
-+        &fops.unlocked_ioctl;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+        
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_UNLOCKED_IOCTL 1
-+_ACEOF
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+        { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+fi
-+rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-+
 +          { echo "$as_me:$LINENO: checking for exported filemap_populate" >&5
 +echo $ECHO_N "checking for exported filemap_populate... $ECHO_C" >&6; }
 +cat >conftest.c <<_ACEOF
@@ -11346,7 +11162,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -11400,7 +11216,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -11471,7 +11287,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -11543,7 +11359,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -11602,7 +11418,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -11671,7 +11487,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -11778,7 +11594,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -11835,7 +11651,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -11890,7 +11706,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -11945,7 +11761,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12003,7 +11819,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12055,7 +11871,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12099,7 +11915,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12163,7 +11979,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12207,7 +12023,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12275,7 +12091,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12324,7 +12140,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12394,7 +12210,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12457,7 +12273,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12562,7 +12378,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12666,7 +12482,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12697,6 +12513,118 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
 +
++          { echo "$as_me:$LINENO: checking if kernel has atomic_cmpxchg" >&5
++echo $ECHO_N "checking if kernel has atomic_cmpxchg... $ECHO_C" >&6; }
++cat >conftest.c <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++        #include <asm/atomic.h>
++
++int
++main (void)
++{
++
++        #ifndef atomic_cmpxchg
++        #error missing atomic_cmpxchg
++        #endif
++
++  ;
++  return 0;
++}
++_ACEOF
++
++rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_ATOMIC_CMPXCHG 1
++_ACEOF
++
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++fi
++rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++
++          { echo "$as_me:$LINENO: checking if kernel has atomic_inc_not_zero" >&5
++echo $ECHO_N "checking if kernel has atomic_inc_not_zero... $ECHO_C" >&6; }
++cat >conftest.c <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++        #include <asm/atomic.h>
++
++int
++main (void)
++{
++
++        #ifndef atomic_inc_not_zero
++        #error missing atomic_inc_not_zero
++        #endif
++
++  ;
++  return 0;
++}
++_ACEOF
++
++rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++      	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_ATOMIC_INC_NOT_ZERO 1
++_ACEOF
++
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++fi
++rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++
 +
 +          # 2.6.16
 +          { echo "$as_me:$LINENO: checking If kernel has security plug support" >&5
@@ -12726,7 +12654,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12786,7 +12714,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12842,7 +12770,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12896,7 +12824,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -12950,7 +12878,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13004,7 +12932,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13070,7 +12998,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13126,7 +13054,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13313,7 +13241,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13378,7 +13306,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13409,6 +13337,79 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
 +
++          as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/fiemap.h" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $LINUX/include/linux/fiemap.h" >&5
++echo $ECHO_N "checking for $LINUX/include/linux/fiemap.h... $ECHO_C" >&6; }
++if { as_var=$as_lb_File; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -r "$LINUX/include/linux/fiemap.h"; then
++  eval "$as_lb_File=yes"
++else
++  eval "$as_lb_File=no"
++fi
++fi
++ac_res=`eval echo '${'$as_lb_File'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_lb_File'}'` = yes; then
++  
++        { echo "$as_me:$LINENO: checking if fiemap.h can be compiled" >&5
++echo $ECHO_N "checking if fiemap.h can be compiled... $ECHO_C" >&6; }
++        cat >conftest.c <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++                #include <linux/types.h>
++                #include <linux/fiemap.h>
++        
++int
++main (void)
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++
++rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++                { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++                
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_LINUX_FIEMAP_H 1
++_ACEOF
++
++        
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++                { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++        
++fi
++rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++
++fi
++
++
 +
 +          # 2.6.19
 +          { echo "$as_me:$LINENO: checking inode has i_blksize field" >&5
@@ -13435,7 +13436,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13499,7 +13500,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13554,7 +13555,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13579,7 +13580,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
-+       { echo "$as_me:$LINENO: result: no" >&5
++	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +
 +fi
@@ -13609,7 +13610,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13664,7 +13665,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13725,7 +13726,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13784,7 +13785,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13840,7 +13841,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13894,7 +13895,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -13949,7 +13950,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14005,7 +14006,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14061,7 +14062,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14148,7 +14149,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14179,30 +14180,53 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
 +
-+          { echo "$as_me:$LINENO: checking if kernel has register_shrinker" >&5
-+echo $ECHO_N "checking if kernel has register_shrinker... $ECHO_C" >&6; }
-+cat >conftest.c <<_ACEOF
++          { echo "$as_me:$LINENO: checking if Linux was built with symbol register_shrinker exported" >&5
++echo $ECHO_N "checking if Linux was built with symbol register_shrinker exported... $ECHO_C" >&6; }
++grep -q -E '[[:space:]]register_shrinker[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
++rc=$?
++if test $rc -ne 0; then
++    export=0
++    for file in mm/vmscan.c; do
++    	grep -q -E "EXPORT_SYMBOL.*\(register_shrinker\)" "$LINUX/$file" 2>/dev/null
++    	rc=$?
++	if test $rc -eq 0; then
++		export=1
++		break;
++	fi
++    done
++    if test $export -eq 0; then
++    	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++    	
++        { echo "$as_me:$LINENO: checking if kernel using gfp_t for shrinker second paramter" >&5
++echo $ECHO_N "checking if kernel using gfp_t for shrinker second paramter... $ECHO_C" >&6; }
++        tmp_flags="$EXTRA_KCFLAGS"
++        EXTRA_KCFLAGS="-Werror"
++        cat >conftest.c <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +
-+        #include <linux/mm.h>
-+
++                #include <linux/mm.h>
++        
 +int
 +main (void)
 +{
 +
-+        register_shrinker(NULL);
-+
++                struct shrinker *scb(int nts, gfp_t mask) {
++                        return 0;
++                }
++                shrinter_t fp = scb;
++        
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14214,24 +14238,54 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  
-+        { echo "$as_me:$LINENO: result: yes" >&5
++                { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+        
++                
 +cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_REGISTER_SHRINKER 1
++@%:@define SHRINKER_MASK_T gfp_t
 +_ACEOF
 +
-+
++        
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
-+        { echo "$as_me:$LINENO: result: no" >&5
++                { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
++                
++cat >>confdefs.h <<\_ACEOF
++@%:@define SHRINKER_MASK_T unsigned int
++_ACEOF
 +
++        
 +fi
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++        EXTRA_KCFLAGS="$tmp_flags"
++
++    else
++    	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++    	
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_REGISTER_SHRINKER 1
++_ACEOF
++
++
++    fi
++else
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++    
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_REGISTER_SHRINKER 1
++_ACEOF
++
++
++fi
++
 +
 +          { echo "$as_me:$LINENO: checking if kernel has pde_users member in procfs entry struct" >&5
 +echo $ECHO_N "checking if kernel has pde_users member in procfs entry struct... $ECHO_C" >&6; }
@@ -14258,7 +14312,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14316,7 +14370,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14403,7 +14457,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14463,7 +14517,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14519,7 +14573,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14551,6 +14605,63 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
 +
 +
++          # 2.6.24-19-generic Ubuntu
++          { echo "$as_me:$LINENO: checking kernel has a remove_suid that takes a struct path" >&5
++echo $ECHO_N "checking kernel has a remove_suid that takes a struct path... $ECHO_C" >&6; }
++cat >conftest.c <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++        #include <linux/fs.h>
++
++int
++main (void)
++{
++
++        struct path *a_path = NULL;
++        remove_suid(a_path);
++
++  ;
++  return 0;
++}
++_ACEOF
++
++rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_PATH_REMOVE_SUID 1
++_ACEOF
++
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++fi
++rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++
++
 +          # 2.6.26
 +          { echo "$as_me:$LINENO: checking fs_struct use path structure" >&5
 +echo $ECHO_N "checking fs_struct use path structure... $ECHO_C" >&6; }
@@ -14580,7 +14691,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14611,7 +14722,6 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
 +
-+          LC_RCU_LIST_SAFE
 +
 +          # 2.6.27
 +          { echo "$as_me:$LINENO: checking inode_operations->permission have two args" >&5
@@ -14639,7 +14749,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14693,7 +14803,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14747,7 +14857,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14805,7 +14915,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14861,7 +14971,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -14959,7 +15069,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -15014,7 +15124,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -15068,7 +15178,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -15125,7 +15235,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -15214,7 +15324,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -15268,7 +15378,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -15322,7 +15432,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -15354,6 +15464,233 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
 +
 +
++          #2.6.29
++          { echo "$as_me:$LINENO: checking if kernel has .write_begin/end" >&5
++echo $ECHO_N "checking if kernel has .write_begin/end... $ECHO_C" >&6; }
++cat >conftest.c <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++        #include <linux/fs.h>
++#ifdef HAVE_LINUX_MMTYPES_H
++        #include <linux/mm_types.h>
++#endif
++        #include <linux/pagemap.h>
++
++int
++main (void)
++{
++
++        struct address_space_operations aops;
++        struct page *page;
++
++        aops.write_begin = NULL;
++        aops.write_end = NULL;
++        page = grab_cache_page_write_begin(NULL, 0, 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++
++rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_KERNEL_WRITE_BEGIN_END 1
++_ACEOF
++
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++fi
++rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++
++          { echo "$as_me:$LINENO: checking d_obtain_alias exist in kernel" >&5
++echo $ECHO_N "checking d_obtain_alias exist in kernel... $ECHO_C" >&6; }
++cat >conftest.c <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++        #include <linux/dcache.h>
++
++int
++main (void)
++{
++
++        d_obtain_alias(NULL);
++
++  ;
++  return 0;
++}
++_ACEOF
++
++rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_D_OBTAIN_ALIAS 1
++_ACEOF
++
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++fi
++rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++
++          { echo "$as_me:$LINENO: checking blkdev_put needs 2 parameters" >&5
++echo $ECHO_N "checking blkdev_put needs 2 parameters... $ECHO_C" >&6; }
++cat >conftest.c <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++        #include <linux/fs.h>
++
++int
++main (void)
++{
++
++        blkdev_put(NULL, 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++
++rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_BLKDEV_PUT_2ARGS 1
++_ACEOF
++
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++fi
++rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++
++          { echo "$as_me:$LINENO: checking dentry_open needs 4 parameters" >&5
++echo $ECHO_N "checking dentry_open needs 4 parameters... $ECHO_C" >&6; }
++cat >conftest.c <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++        #include <linux/fs.h>
++
++int
++main (void)
++{
++
++        dentry_open(NULL, NULL, 0, NULL);
++
++  ;
++  return 0;
++}
++_ACEOF
++
++rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_DENTRY_OPEN_4ARGS 1
++_ACEOF
++
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++fi
++rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
++
++
 +			;;
 +		darwin*)
 +			LB_PROG_DARWIN
@@ -15369,7 +15706,6 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +
 +
-+
 +{ echo "$as_me:$LINENO: checking userspace __u64 is long long type" >&5
 +echo $ECHO_N "checking userspace __u64 is long long type... $ECHO_C" >&6; }
 +tmp_flags="$CFLAGS"
@@ -15428,6 +15764,41 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +
 +
 +
++if test x$RHEL_KERNEL = xyes; then
++	# Check whether --enable-ext4 was given.
++if test "${enable_ext4+set}" = set; then
++  enableval=$enable_ext4; 
++else
++  
++			if test x$ldiskfs_is_ext4 = xyes; then
++				enable_ext4=yes
++			else
++				enable_ext4=no
++			fi
++		
++fi
++
++else
++	case $LINUXRELEASE in
++	# ext4 was in 2.6.22-2.6.26 but not stable enough to use
++	2.6.20-6*) enable_ext4='no' ;;
++	*)  if test -f $LINUX/fs/ext4/ext4.h ; then
++enable_ext4='yes'
++else
++enable_ext4='no'
++fi
++ ;;
++	esac
++fi
++if test x$enable_ext4 = xyes; then
++	 ac_configure_args="$ac_configure_args --enable-ext4"
++fi
++{ echo "$as_me:$LINENO: checking whether to build ldiskfs based on ext4" >&5
++echo $ECHO_N "checking whether to build ldiskfs based on ext4... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_ext4" >&5
++echo "${ECHO_T}$enable_ext4" >&6; }
++
++
 +# Check whether --enable-dmu was given.
 +if test "${enable_dmu+set}" = set; then
 +  enableval=$enable_dmu; 
@@ -15502,12 +15873,11 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +
 +	else
 +		# Kernel DMU
-+		SPL_DIR="$PWD/spl"
-+		ZFS_DIR="$PWD/zfs"
-+		
-+		
++		SPL_SUBDIR="spl"
++		ZFS_SUBDIR="zfs"
 +
-+		
++		SPL_DIR="$PWD/$SPL_SUBDIR"
++		ZFS_DIR="$PWD/$ZFS_SUBDIR"
 +
 +		as_lb_File=`echo "lb_cv_file_$SPL_DIR/module/spl/spl-generic.c" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $SPL_DIR/module/spl/spl-generic.c" >&5
@@ -15570,6 +15940,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +
 +
++
++
++
++
 +if test x$dmu_osd = xyes; then
 +  DMU_OSD_ENABLED_TRUE=
 +  DMU_OSD_ENABLED_FALSE='#'
@@ -15718,6 +16092,12 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +	
 +fi
 +
++
++# Check whether --with-ldiskfs-inkernel was given.
++if test "${with_ldiskfs_inkernel+set}" = set; then
++  withval=$with_ldiskfs_inkernel; with_ldiskfs=inkernel
++fi
++
 +{ echo "$as_me:$LINENO: checking location of ldiskfs" >&5
 +echo $ECHO_N "checking location of ldiskfs... $ECHO_C" >&6; }
 +case x$with_ldiskfs in
@@ -15756,6 +16136,35 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +		{ echo "$as_me:$LINENO: result: disabled" >&5
 +echo "${ECHO_T}disabled" >&6; }
 +		;;
++	xinkernel)
++		{ echo "$as_me:$LINENO: result: inkernel" >&5
++echo "${ECHO_T}inkernel" >&6; }
++		as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/ldiskfs_fs.h" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $LINUX/include/linux/ldiskfs_fs.h" >&5
++echo $ECHO_N "checking for $LINUX/include/linux/ldiskfs_fs.h... $ECHO_C" >&6; }
++if { as_var=$as_lb_File; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -r "$LINUX/include/linux/ldiskfs_fs.h"; then
++  eval "$as_lb_File=yes"
++else
++  eval "$as_lb_File=no"
++fi
++fi
++ac_res=`eval echo '${'$as_lb_File'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_lb_File'}'` = yes; then
++  :
++else
++  
++			{ { echo "$as_me:$LINENO: error: ldiskfs was not found in $LINUX/include/linux/ldiskfs_fs.h" >&5
++echo "$as_me: error: ldiskfs was not found in $LINUX/include/linux/ldiskfs_fs.h" >&2;}
++   { (exit 1); exit 1; }; }
++		
++fi
++
++		;;
 +	*)
 +		{ echo "$as_me:$LINENO: result: $with_ldiskfs" >&5
 +echo "${ECHO_T}$with_ldiskfs" >&6; }
@@ -15800,6 +16209,16 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +fi
 +
 +
++
++if test x$with_ldiskfs = xinkernel; then
++  LDISKFS_IN_KERNEL_TRUE=
++  LDISKFS_IN_KERNEL_FALSE='#'
++else
++  LDISKFS_IN_KERNEL_TRUE='#'
++  LDISKFS_IN_KERNEL_FALSE=
++fi
++
++
 +if test x$enable_ext4 = xyes ; then
 +	
 +cat >>confdefs.h <<\_ACEOF
@@ -15813,9 +16232,9 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +
 +
 +
-+# Check whether --with- was given.
-+if test "${with_+set}" = set; then
-+  withval=$with_; 
++# Check whether --with-lustre-iokit was given.
++if test "${with_lustre_iokit+set}" = set; then
++  withval=$with_lustre_iokit; 
 +else
 +  
 +			with_lustre_iokit='yes'
@@ -19359,7 +19778,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +		;;
 +esac
 +
-+ac_config_files="$ac_config_files lustre/Makefile lustre/autoMakefile lustre/autoconf/Makefile lustre/contrib/Makefile lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre_ver.h lustre/include/linux/Makefile lustre/include/lustre/Makefile lustre/kernel_patches/targets/2.6-suse.target lustre/kernel_patches/targets/2.6-vanilla.target lustre/kernel_patches/targets/2.6-rhel4.target lustre/kernel_patches/targets/2.6-rhel5.target lustre/kernel_patches/targets/2.6-fc5.target lustre/kernel_patches/targets/2.6-patchless.target lustre/kernel_patches/targets/2.6-sles10.target lustre/kernel_patches/targets/2.6-sles11.target lustre/kernel_patches/targets/hp_pnnl-2.4.target lustre/kernel_patches/targets/rh-2.4.target lustre/kernel_patches/targets/rhel-2.4.target lustre/kernel_patches/targets/suse-2.4.21-2.target lustre/kernel_patches/targets/sles-2.4.target lustre/ldlm/Makefile lustre/liblustre/Makefile lustre/liblustre/tests/Makefile lustre/liblustre/tests/mpi/Makefile lustre/llite/Makefile lustre/llite/autoMakefile lustre/lov/Makefile lustre/lov/autoMakefile lustre/lvfs/Makefile lustre/lvfs/autoMakefile lustre/mdc/Makefile lustre/mdc/autoMakefile lustre/mds/Makefile lustre/mds/autoMakefile lustre/obdclass/Makefile lustre/obdclass/autoMakefile lustre/obdclass/linux/Makefile lustre/obdecho/Makefile lustre/obdecho/autoMakefile lustre/obdfilter/Makefile lustre/obdfilter/autoMakefile lustre/osc/Makefile lustre/osc/autoMakefile lustre/ost/Makefile lustre/ost/autoMakefile lustre/mgc/Makefile lustre/mgc/autoMakefile lustre/mgs/Makefile lustre/mgs/autoMakefile lustre/ptlrpc/Makefile lustre/ptlrpc/autoMakefile lustre/quota/Makefile lustre/quota/autoMakefile lustre/scripts/Makefile lustre/tests/Makefile lustre/tests/mpi/Makefile lustre/utils/Makefile"
++ac_config_files="$ac_config_files lustre/Makefile lustre/autoMakefile lustre/autoconf/Makefile lustre/contrib/Makefile lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre_ver.h lustre/include/linux/Makefile lustre/include/lustre/Makefile lustre/kernel_patches/targets/2.6-suse.target lustre/kernel_patches/targets/2.6-vanilla.target lustre/kernel_patches/targets/2.6-rhel4.target lustre/kernel_patches/targets/2.6-rhel5.target lustre/kernel_patches/targets/2.6-fc5.target lustre/kernel_patches/targets/2.6-patchless.target lustre/kernel_patches/targets/2.6-sles10.target lustre/kernel_patches/targets/2.6-sles11.target lustre/kernel_patches/targets/hp_pnnl-2.4.target lustre/kernel_patches/targets/rh-2.4.target lustre/kernel_patches/targets/rhel-2.4.target lustre/kernel_patches/targets/suse-2.4.21-2.target lustre/kernel_patches/targets/sles-2.4.target lustre/kernel_patches/targets/2.6-oel5.target lustre/ldlm/Makefile lustre/liblustre/Makefile lustre/liblustre/tests/Makefile lustre/liblustre/tests/mpi/Makefile lustre/llite/Makefile lustre/llite/autoMakefile lustre/lov/Makefile lustre/lov/autoMakefile lustre/lvfs/Makefile lustre/lvfs/autoMakefile lustre/mdc/Makefile lustre/mdc/autoMakefile lustre/mds/Makefile lustre/mds/autoMakefile lustre/obdclass/Makefile lustre/obdclass/autoMakefile lustre/obdclass/linux/Makefile lustre/obdecho/Makefile lustre/obdecho/autoMakefile lustre/obdfilter/Makefile lustre/obdfilter/autoMakefile lustre/osc/Makefile lustre/osc/autoMakefile lustre/ost/Makefile lustre/ost/autoMakefile lustre/mgc/Makefile lustre/mgc/autoMakefile lustre/mgs/Makefile lustre/mgs/autoMakefile lustre/ptlrpc/Makefile lustre/ptlrpc/autoMakefile lustre/quota/Makefile lustre/quota/autoMakefile lustre/scripts/Makefile lustre/tests/Makefile lustre/tests/mpi/Makefile lustre/utils/Makefile"
 +
 +case $lb_target_os in
 +        darwin)
@@ -19525,6 +19944,13 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +Usually this means the macro was only invoked conditionally." >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
++if test -z "${LDISKFS_IN_KERNEL_TRUE}" && test -z "${LDISKFS_IN_KERNEL_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"LDISKFS_IN_KERNEL\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"LDISKFS_IN_KERNEL\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
 +if test -z "${MODULES_TRUE}" && test -z "${MODULES_FALSE}"; then
 +  { { echo "$as_me:$LINENO: error: conditional \"MODULES\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&5
@@ -20049,7 +20475,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +# report actual input values of CONFIG_FILES etc. instead of their
 +# values after options handling.
 +ac_log="
-+This file was extended by Lustre $as_me 1.8.1, which was
++This file was extended by Lustre $as_me 1.8.2, which was
 +generated by GNU Autoconf 2.61.  Invocation command line was
 +
 +  CONFIG_FILES    = $CONFIG_FILES
@@ -20102,7 +20528,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +_ACEOF
 +cat >>$CONFIG_STATUS <<_ACEOF
 +ac_cs_version="\\
-+Lustre config.status 1.8.1
++Lustre config.status 1.8.2
 +configured by $0, generated by GNU Autoconf 2.61,
 +  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 +
@@ -20292,6 +20718,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +    "lustre/kernel_patches/targets/rhel-2.4.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/rhel-2.4.target" ;;
 +    "lustre/kernel_patches/targets/suse-2.4.21-2.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/suse-2.4.21-2.target" ;;
 +    "lustre/kernel_patches/targets/sles-2.4.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/sles-2.4.target" ;;
++    "lustre/kernel_patches/targets/2.6-oel5.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-oel5.target" ;;
 +    "lustre/ldlm/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/ldlm/Makefile" ;;
 +    "lustre/liblustre/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/liblustre/Makefile" ;;
 +    "lustre/liblustre/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/liblustre/tests/Makefile" ;;
@@ -20592,9 +21019,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +BACKINGFS!$BACKINGFS$ac_delim
 +DMU_SRC!$DMU_SRC$ac_delim
 +subdirs!$subdirs$ac_delim
++SPL_SUBDIR!$SPL_SUBDIR$ac_delim
++ZFS_SUBDIR!$ZFS_SUBDIR$ac_delim
 +SPL_DIR!$SPL_DIR$ac_delim
 +ZFS_DIR!$ZFS_DIR$ac_delim
-+spl_src!$spl_src$ac_delim
 +DMU_OSD_ENABLED_TRUE!$DMU_OSD_ENABLED_TRUE$ac_delim
 +DMU_OSD_ENABLED_FALSE!$DMU_OSD_ENABLED_FALSE$ac_delim
 +KDMU_TRUE!$KDMU_TRUE$ac_delim
@@ -20603,6 +21031,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +SNMP_SUBDIR!$SNMP_SUBDIR$ac_delim
 +LDISKFS_DIR!$LDISKFS_DIR$ac_delim
 +LDISKFS_SUBDIR!$LDISKFS_SUBDIR$ac_delim
++LDISKFS_IN_KERNEL_TRUE!$LDISKFS_IN_KERNEL_TRUE$ac_delim
++LDISKFS_IN_KERNEL_FALSE!$LDISKFS_IN_KERNEL_FALSE$ac_delim
 +LUSTREIOKIT_SUBDIR!$LUSTREIOKIT_SUBDIR$ac_delim
 +MPICC_WRAPPER!$MPICC_WRAPPER$ac_delim
 +LIBREADLINE!$LIBREADLINE$ac_delim
@@ -20626,9 +21056,6 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +TESTS_TRUE!$TESTS_TRUE$ac_delim
 +TESTS_FALSE!$TESTS_FALSE$ac_delim
 +DOC_TRUE!$DOC_TRUE$ac_delim
-+DOC_FALSE!$DOC_FALSE$ac_delim
-+INIT_SCRIPTS_TRUE!$INIT_SCRIPTS_TRUE$ac_delim
-+INIT_SCRIPTS_FALSE!$INIT_SCRIPTS_FALSE$ac_delim
 +_ACEOF
 +
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -20670,6 +21097,9 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  cat >conf$$subs.sed <<_ACEOF
++DOC_FALSE!$DOC_FALSE$ac_delim
++INIT_SCRIPTS_TRUE!$INIT_SCRIPTS_TRUE$ac_delim
++INIT_SCRIPTS_FALSE!$INIT_SCRIPTS_FALSE$ac_delim
 +LINUX_TRUE!$LINUX_TRUE$ac_delim
 +LINUX_FALSE!$LINUX_FALSE$ac_delim
 +DARWIN_TRUE!$DARWIN_TRUE$ac_delim
@@ -20732,7 +21162,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +LTLIBOBJS!$LTLIBOBJS$ac_delim
 +_ACEOF
 +
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -21523,11 +21953,11 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/output.0 lustre-1.8.1/autom4te.cach
 +Type 'make' to build Lustre.
 +_ACEOF
 +
-diff -Nurwd lustre-1.8.1.orig/autom4te.cache/requests lustre-1.8.1/autom4te.cache/requests
---- lustre-1.8.1.orig/autom4te.cache/requests	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/autom4te.cache/requests	2009-09-10 11:17:08.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/autom4te.cache/requests lustre-1.8.2/autom4te.cache/requests
+--- orig/lustre-1.8.2/autom4te.cache/requests	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/autom4te.cache/requests	2010-03-03 16:00:15.640632502 +0000
 @@ -0,0 +1,64 @@
-+# This file was generated by Autom4te Wed Jan 17 19:57:31 PST 2007.
++# This file was generated by Autom4te Mon Aug 11 20:59:21 PDT 2008.
 +# It contains the lists of macros which have been traced.
 +# It can be safely removed.
 +
@@ -21591,11 +22021,11 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/requests lustre-1.8.1/autom4te.cach
 +                    ], 'Autom4te::Request' )
 +           );
 +
-diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cache/traces.0
---- lustre-1.8.1.orig/autom4te.cache/traces.0	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/autom4te.cache/traces.0	2009-09-10 11:16:55.000000000 +0200
-@@ -0,0 +1,2419 @@
-+m4trace:aclocal.m4:6020: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+diff -Nurwd orig/lustre-1.8.2/autom4te.cache/traces.0 lustre-1.8.2/autom4te.cache/traces.0
+--- orig/lustre-1.8.2/autom4te.cache/traces.0	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/autom4te.cache/traces.0	2010-03-03 16:00:10.088633782 +0000
+@@ -0,0 +1,2468 @@
++m4trace:aclocal.m4:6046: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
 +m4trace:configure.ac:2: -1- AC_INIT([Lustre], [LUSTRE_VERSION], [https://bugzilla.lustre.org/], [lustre])
 +m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_])
 +m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_])
@@ -21784,7 +22214,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:6: -1- m4_pattern_allow([^LDISKFS_ENABLED_FALSE$])
 +m4trace:configure.ac:11: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3090: LC_CONFIG_QUOTA is expanded from...
++aclocal.m4:3055: LC_CONFIG_QUOTA is expanded from...
 +configure.ac:11: the top level])
 +m4trace:configure.ac:13: -1- AC_CANONICAL_SYSTEM
 +m4trace:configure.ac:13: -1- _m4_warn([obsolete], [The macro `AC_CANONICAL_SYSTEM' is obsolete.
@@ -21848,8 +22278,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:15: -1- m4_pattern_allow([^CYGPATH_W$])
 +m4trace:configure.ac:15: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from...
-+aclocal.m4:6180: _AM_SET_OPTIONS is expanded from...
-+aclocal.m4:6033: AM_INIT_AUTOMAKE is expanded from...
++aclocal.m4:6206: _AM_SET_OPTIONS is expanded from...
++aclocal.m4:6059: AM_INIT_AUTOMAKE is expanded from...
 +configure.ac:15: the top level])
 +m4trace:configure.ac:15: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
 +m4trace:configure.ac:15: -1- AC_SUBST_TRACE([PACKAGE])
@@ -21982,8 +22412,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^INCLUDE_RULES$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:456: LB_CONFIG_CRAY_XT3 is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:505: LB_CONFIG_CRAY_XT3 is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([CRAY_XT3])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^CRAY_XT3$])
@@ -21991,8 +22421,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef CRAY_XT3])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:473: LB_CONFIG_BGL is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:522: LB_CONFIG_BGL is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BGL_SUPPORT])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_BGL_SUPPORT$])
@@ -22077,8 +22507,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^EXTRA_KCFLAGS$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:493: LB_UOSS is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:542: LB_UOSS is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([UOSS_SUPPORT])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^UOSS_SUPPORT$])
@@ -22093,8 +22523,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^enable_uoss$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:517: LB_POSIX_OSD is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:566: LB_POSIX_OSD is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([POSIX_OSD])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^POSIX_OSD$])
@@ -22109,39 +22539,39 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^POSIX_OSD_ENABLED_FALSE$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:690: LB_CONFIG_DOCS is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:742: LB_CONFIG_DOCS is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([ENABLE_DOC])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ENABLE_DOC])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^ENABLE_DOC$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:656: LB_CONFIG_UTILS is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:708: LB_CONFIG_UTILS is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([ENABLE_INIT_SCRIPTS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ENABLE_INIT_SCRIPTS])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^ENABLE_INIT_SCRIPTS$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:673: LB_CONFIG_TESTS is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:725: LB_CONFIG_TESTS is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:2944: LC_CONFIG_CLIENT_SERVER is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:2909: LC_CONFIG_CLIENT_SERVER is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:2944: LC_CONFIG_CLIENT_SERVER is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:2909: LC_CONFIG_CLIENT_SERVER is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4104: LN_CONFIG_CDEBUG is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4070: LN_CONFIG_CDEBUG is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([CDEBUG_ENABLED])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^CDEBUG_ENABLED$])
@@ -22153,8 +22583,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef CDEBUG_ENABLED])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4104: LN_CONFIG_CDEBUG is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4070: LN_CONFIG_CDEBUG is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([CDEBUG_ENTRY_EXIT])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^CDEBUG_ENTRY_EXIT$])
@@ -22166,8 +22596,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef CDEBUG_ENTRY_EXIT])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4104: LN_CONFIG_CDEBUG is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4070: LN_CONFIG_CDEBUG is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([LIBCFS_DEBUG])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBCFS_DEBUG$])
@@ -22175,9 +22605,9 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef LIBCFS_DEBUG])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3090: LC_CONFIG_QUOTA is expanded from...
-+aclocal.m4:3110: LC_QUOTA is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3055: LC_CONFIG_QUOTA is expanded from...
++aclocal.m4:3075: LC_QUOTA is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_QUOTA_H])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_SYS_QUOTA_H$])
@@ -22185,25 +22615,25 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef HAVE_SYS_QUOTA_H])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3569: LB_LINUX_PATH is expanded from...
-+aclocal.m4:3962: LB_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3535: LB_LINUX_PATH is expanded from...
++aclocal.m4:3928: LB_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([LINUX])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LINUX])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LINUX$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3569: LB_LINUX_PATH is expanded from...
-+aclocal.m4:3962: LB_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3535: LB_LINUX_PATH is expanded from...
++aclocal.m4:3928: LB_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([LINUX_OBJ])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LINUX_OBJ])
@@ -22211,20 +22641,20 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 +../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from...
-+aclocal.m4:3569: LB_LINUX_PATH is expanded from...
-+aclocal.m4:3962: LB_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3535: LB_LINUX_PATH is expanded from...
++aclocal.m4:3928: LB_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([LINUX_CONFIG])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LINUX_CONFIG])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LINUX_CONFIG$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3569: LB_LINUX_PATH is expanded from...
-+aclocal.m4:3962: LB_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3535: LB_LINUX_PATH is expanded from...
++aclocal.m4:3928: LB_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([ARCH_UM])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ARCH_UM])
@@ -22261,10 +22691,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^SYMVERFILE$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3897: LB_CONFIG_OFED_BACKPORTS is expanded from...
-+aclocal.m4:3962: LB_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3863: LB_CONFIG_OFED_BACKPORTS is expanded from...
++aclocal.m4:3928: LB_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CPU_ONLINE])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_CPU_ONLINE$])
@@ -22280,10 +22710,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef HAVE_CPUMASK_T])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4146: LN_CONFIG_AFFINITY is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4112: LN_CONFIG_AFFINITY is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([CPU_AFFINITY])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^CPU_AFFINITY$])
@@ -22291,10 +22721,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef CPU_AFFINITY])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4214: LN_CONFIG_BACKOFF is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4180: LN_CONFIG_BACKOFF is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([SOCKNAL_BACKOFF])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^SOCKNAL_BACKOFF$])
@@ -22306,10 +22736,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef SOCKNAL_BACKOFF_MS])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4241: LN_CONFIG_PANIC_DUMPLOG is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4207: LN_CONFIG_PANIC_DUMPLOG is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([LNET_DUMP_ON_PANIC])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LNET_DUMP_ON_PANIC$])
@@ -22317,10 +22747,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef LNET_DUMP_ON_PANIC])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4333: LN_CONFIG_QUADRICS is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4299: LN_CONFIG_QUADRICS is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([QSWCPPFLAGS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([QSWCPPFLAGS])
@@ -22330,17 +22760,17 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^QSWLND$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4378: LN_CONFIG_GM is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4344: LN_CONFIG_GM is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4378: LN_CONFIG_GM is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4344: LN_CONFIG_GM is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([GMCPPFLAGS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([GMCPPFLAGS])
@@ -22353,10 +22783,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^GMLND$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4679: LN_CONFIG_OPENIB is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4645: LN_CONFIG_OPENIB is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([OPENIBCPPFLAGS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([OPENIBCPPFLAGS])
@@ -22366,10 +22796,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^OPENIBLND$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4757: LN_CONFIG_CIB is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4723: LN_CONFIG_CIB is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([CIBCPPFLAGS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CIBCPPFLAGS])
@@ -22379,10 +22809,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^CIBLND$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4887: LN_CONFIG_VIB is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4853: LN_CONFIG_VIB is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([VIBCPPFLAGS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([VIBCPPFLAGS])
@@ -22392,10 +22822,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^VIBLND$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4814: LN_CONFIG_IIB is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4780: LN_CONFIG_IIB is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([IIBCPPFLAGS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([IIBCPPFLAGS])
@@ -22405,10 +22835,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^IIBLND$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4556: LN_CONFIG_O2IB is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4522: LN_CONFIG_O2IB is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OFED_IB_DMA_MAP])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_OFED_IB_DMA_MAP$])
@@ -22447,11 +22877,11 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^RALND$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4180: LN_CONFIG_PORTALS is expanded from...
-+aclocal.m4:4260: LN_CONFIG_PTLLND is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4146: LN_CONFIG_PORTALS is expanded from...
++aclocal.m4:4226: LN_CONFIG_PTLLND is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([PTLLNDCPPFLAGS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([PTLLNDCPPFLAGS])
@@ -22461,10 +22891,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^PTLLND$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4477: LN_CONFIG_MX is expanded from...
-+aclocal.m4:5513: LN_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4443: LN_CONFIG_MX is expanded from...
++aclocal.m4:5534: LN_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([MXCPPFLAGS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([MXCPPFLAGS])
@@ -22575,6 +23005,22 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_TRACE_ADDRESS_RELIABLE$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_TRACE_ADDRESS_RELIABLE], [/* print_trace_address has reliable argument */
 +#undef HAVE_TRACE_ADDRESS_RELIABLE])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LINUX_CRED_H])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LINUX_CRED_H$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_LINUX_CRED_H], [/* kernel has include/linux/cred.h */
++#undef HAVE_LINUX_CRED_H])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_CRED])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_STRUCT_CRED$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_STRUCT_CRED], [/* struct cred found */
++#undef HAVE_STRUCT_CRED])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNSHARE_FS_STRUCT])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_UNSHARE_FS_STRUCT$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_UNSHARE_FS_STRUCT], [/* unshare_fs_struct found */
++#undef HAVE_UNSHARE_FS_STRUCT])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_SET_RDONLY])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_DEV_SET_RDONLY$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_DEV_SET_RDONLY], [/* kernel has new dev_set_rdonly */
++#undef HAVE_DEV_SET_RDONLY])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_MODULE])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_MODULE$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_MODULE], [/* build ldiskfs as a module */
@@ -22603,19 +23049,15 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^CONFIG_LDISKFSDEV_FS_SECURITY$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([CONFIG_LDISKFSDEV_FS_SECURITY], [/* enable fs security for ldiskfs */
 +#undef CONFIG_LDISKFSDEV_FS_SECURITY])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_NFS4ACL])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_NFS4ACL$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_NFS4ACL], [/* enable fs security for ldiskfs */
-+#undef CONFIG_LDISKFS_FS_NFS4ACL])
 +m4trace:configure.ac:20: -1- AC_SUBST([BACKINGFS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([BACKINGFS])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^BACKINGFS$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:1275: LC_CONFIG_PINGER is expanded from...
-+aclocal.m4:2795: LC_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:1149: LC_CONFIG_PINGER is expanded from...
++aclocal.m4:2755: LC_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_PINGER])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^ENABLE_PINGER$])
@@ -22623,10 +23065,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef ENABLE_PINGER])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:1292: LC_CONFIG_CHECKSUM is expanded from...
-+aclocal.m4:2795: LC_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:1166: LC_CONFIG_CHECKSUM is expanded from...
++aclocal.m4:2755: LC_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_CHECKSUM])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^ENABLE_CHECKSUM$])
@@ -22634,10 +23076,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef ENABLE_CHECKSUM])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:1324: LC_CONFIG_LIBLUSTRE_RECOVERY is expanded from...
-+aclocal.m4:2795: LC_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:1222: LC_CONFIG_LIBLUSTRE_RECOVERY is expanded from...
++aclocal.m4:2755: LC_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_LIBLUSTRE_RECOVERY])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^ENABLE_LIBLUSTRE_RECOVERY$])
@@ -22645,10 +23087,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef ENABLE_LIBLUSTRE_RECOVERY])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:1309: LC_CONFIG_HEALTH_CHECK_WRITE is expanded from...
-+aclocal.m4:2795: LC_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:1207: LC_CONFIG_HEALTH_CHECK_WRITE is expanded from...
++aclocal.m4:2755: LC_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([USE_HEALTH_CHECK_WRITE])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^USE_HEALTH_CHECK_WRITE$])
@@ -22656,10 +23098,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef USE_HEALTH_CHECK_WRITE])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3048: LC_CONFIG_LRU_RESIZE is expanded from...
-+aclocal.m4:2795: LC_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3013: LC_CONFIG_LRU_RESIZE is expanded from...
++aclocal.m4:2755: LC_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LRU_RESIZE_SUPPORT])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LRU_RESIZE_SUPPORT$])
@@ -22667,10 +23109,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef HAVE_LRU_RESIZE_SUPPORT])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3060: LC_CONFIG_ADAPTIVE_TIMEOUTS is expanded from...
-+aclocal.m4:2795: LC_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3025: LC_CONFIG_ADAPTIVE_TIMEOUTS is expanded from...
++aclocal.m4:2755: LC_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AT_SUPPORT])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_AT_SUPPORT$])
@@ -22678,10 +23120,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef HAVE_AT_SUPPORT])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3073: LC_CONFIG_DELAYED_RECOVERY is expanded from...
-+aclocal.m4:2795: LC_PROG_LINUX is expanded from...
-+aclocal.m4:617: LB_CONFIG_MODULES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3038: LC_CONFIG_DELAYED_RECOVERY is expanded from...
++aclocal.m4:2755: LC_PROG_LINUX is expanded from...
++aclocal.m4:669: LB_CONFIG_MODULES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DELAYED_RECOVERY])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_DELAYED_RECOVERY$])
@@ -22691,10 +23133,6 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_QUOTA_SUPPORT$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_QUOTA_SUPPORT], [/* Enable quota support */
 +#undef HAVE_QUOTA_SUPPORT])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TASK_PPTR])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_TASK_PPTR$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_TASK_PPTR], [/* task p_pptr found */
-+#undef HAVE_TASK_PPTR])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TRUNCATE_COMPLETE_PAGE])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_TRUNCATE_COMPLETE_PAGE$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_TRUNCATE_COMPLETE_PAGE], [/* kernel export truncate_complete_page */
@@ -22771,54 +23209,30 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_RELEASEPAGE_WITH_GFP$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_RELEASEPAGE_WITH_GFP], [/* releasepage with gfp_t parameter */
 +#undef HAVE_RELEASEPAGE_WITH_GFP])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MM_INLINE])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_MM_INLINE$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_MM_INLINE], [/* mm_inline found */
-+#undef HAVE_MM_INLINE])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_I_ALLOC_SEM])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_I_ALLOC_SEM$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_I_ALLOC_SEM], [/* struct inode has i_alloc_sem */
-+#undef HAVE_I_ALLOC_SEM])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SHRINKER_CACHE])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_SHRINKER_CACHE$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_SHRINKER_CACHE], [/* shrinker_cache found */
-+#undef HAVE_SHRINKER_CACHE])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CACHE_RETURN_INT])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_CACHE_RETURN_INT$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_CACHE_RETURN_INT], [/* shrinkers should return int */
-+#undef HAVE_CACHE_RETURN_INT])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REGISTER_CACHE])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_REGISTER_CACHE$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_REGISTER_CACHE], [/* register_cache found */
-+#undef HAVE_REGISTER_CACHE])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CACHE_RETURN_INT])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_CACHE_RETURN_INT$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_CACHE_RETURN_INT], [/* kernel expects return from shrink_cache */
-+#undef HAVE_CACHE_RETURN_INT])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDISKFS_XATTR_H])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LDISKFS_XATTR_H$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_LDISKFS_XATTR_H], [/* ldiskfs/xattr.h found */
++#undef HAVE_LDISKFS_XATTR_H])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ADD_TO_PAGE_CACHE_LRU])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_ADD_TO_PAGE_CACHE_LRU$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_ADD_TO_PAGE_CACHE_LRU], [/* kernel exports add_to_page_cache_lru */
++#undef HAVE_ADD_TO_PAGE_CACHE_LRU])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ADD_TO_PAGE_CACHE_LRU])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_ADD_TO_PAGE_CACHE_LRU$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_ADD_TO_PAGE_CACHE_LRU], [/* kernel exports add_to_page_cache_lru */
++#undef HAVE_ADD_TO_PAGE_CACHE_LRU])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP], [/* kernel has grab_cache_page_nowait_gfp() */
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP], [/* kernel exports grab_cache_page_nowait_gfp */
++#undef HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP], [/* kernel exports grab_cache_page_nowait_gfp */
 +#undef HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_SET_RDONLY])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_DEV_SET_RDONLY$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_DEV_SET_RDONLY], [/* kernel has new dev_set_rdonly */
-+#undef HAVE_DEV_SET_RDONLY])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FILEMAP_FDATAWRITE])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_FILEMAP_FDATAWRITE$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_FILEMAP_FDATAWRITE], [/* filemap_fdatawrite() found */
-+#undef HAVE_FILEMAP_FDATAWRITE])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STATFS_NAMELEN])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_STATFS_NAMELEN$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_STATFS_NAMELEN], [/* struct statfs has a namelen field */
 +#undef HAVE_STATFS_NAMELEN])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PAGE_MAPPED])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_PAGE_MAPPED$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_PAGE_MAPPED], [/* page_mapped found */
-+#undef HAVE_PAGE_MAPPED])
-+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNLOCKED_IOCTL])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_UNLOCKED_IOCTL$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_UNLOCKED_IOCTL], [/* struct file_operations has an unlock ed_ioctl field */
-+#undef HAVE_UNLOCKED_IOCTL])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FILEMAP_POPULATE])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_FILEMAP_POPULATE$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_FILEMAP_POPULATE], [/* Kernel exports filemap_populate */
@@ -22927,6 +23341,14 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_INODE_I_MUTEX$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_INODE_I_MUTEX], [/* after 2.6.15 inode have i_mutex intead of i_sem */
 +#undef HAVE_INODE_I_MUTEX])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ATOMIC_CMPXCHG])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_ATOMIC_CMPXCHG$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_ATOMIC_CMPXCHG], [/* kernel has atomic_cmpxchg */
++#undef HAVE_ATOMIC_CMPXCHG])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ATOMIC_INC_NOT_ZERO])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_ATOMIC_INC_NOT_ZERO$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_ATOMIC_INC_NOT_ZERO], [/* kernel has atomic_inc_not_zero */
++#undef HAVE_ATOMIC_INC_NOT_ZERO])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SECURITY_PLUG])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_SECURITY_PLUG$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_SECURITY_PLUG], [/* SLES10 SP2 use extra parameter in vfs */
@@ -22991,6 +23413,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_PAGE_CHECKED$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_PAGE_CHECKED], [/* does kernel have PageChecked and SetPageChecked */
 +#undef HAVE_PAGE_CHECKED])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LINUX_FIEMAP_H])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LINUX_FIEMAP_H$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_LINUX_FIEMAP_H], [/* Kernel has fiemap.h */
++#undef HAVE_LINUX_FIEMAP_H])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INODE_BLKSIZE])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_INODE_BLKSIZE$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_INODE_BLKSIZE], [/* struct inode has i_blksize field */
@@ -23047,9 +23473,21 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_VM_OP_FAULT$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_VM_OP_FAULT], [/* if kernel has .fault in vm_operation_struct */
 +#undef HAVE_VM_OP_FAULT])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([SHRINKER_MASK_T])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^SHRINKER_MASK_T$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([SHRINKER_MASK_T], [/* kernel using gfp_t for shrinker callback */
++#undef SHRINKER_MASK_T])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([SHRINKER_MASK_T])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^SHRINKER_MASK_T$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([SHRINKER_MASK_T], [/* kernel using unsigned for shrinker callback */
++#undef SHRINKER_MASK_T])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REGISTER_SHRINKER])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_REGISTER_SHRINKER$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_REGISTER_SHRINKER], [/* kernel exports register_shrinker */
++#undef HAVE_REGISTER_SHRINKER])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REGISTER_SHRINKER])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_REGISTER_SHRINKER$])
-+m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_REGISTER_SHRINKER], [/* if kernel has register_shrinker */
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_REGISTER_SHRINKER], [/* kernel exports register_shrinker */
 +#undef HAVE_REGISTER_SHRINKER])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PROCFS_USERS])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_PROCFS_USERS$])
@@ -23075,6 +23513,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_PROCFS_DELETED$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_PROCFS_DELETED], [/* kernel has deleted member in procfs entry struct */
 +#undef HAVE_PROCFS_DELETED])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PATH_REMOVE_SUID])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_PATH_REMOVE_SUID$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_PATH_REMOVE_SUID], [/* kernel has a remove suid that takes a struct path */
++#undef HAVE_PATH_REMOVE_SUID])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FS_STRUCT_USE_PATH])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_FS_STRUCT_USE_PATH$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_FS_STRUCT_USE_PATH], [/* fs_struct use path structure */
@@ -23139,14 +23581,35 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_SB_HAS_QUOTA_ACTIVE$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_SB_HAS_QUOTA_ACTIVE], [/* Kernel has a sb_has_quota_active */
 +#undef HAVE_SB_HAS_QUOTA_ACTIVE])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KERNEL_WRITE_BEGIN_END])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_KERNEL_WRITE_BEGIN_END$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_KERNEL_WRITE_BEGIN_END], [/* kernel has .write_begin/end */
++#undef HAVE_KERNEL_WRITE_BEGIN_END])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_D_OBTAIN_ALIAS])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_D_OBTAIN_ALIAS$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_D_OBTAIN_ALIAS], [/* d_obtain_alias exist in kernel */
++#undef HAVE_D_OBTAIN_ALIAS])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BLKDEV_PUT_2ARGS])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_BLKDEV_PUT_2ARGS$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_BLKDEV_PUT_2ARGS], [/* blkdev_put needs 2 paramters */
++#undef HAVE_BLKDEV_PUT_2ARGS])
++m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DENTRY_OPEN_4ARGS])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_DENTRY_OPEN_4ARGS$])
++m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_DENTRY_OPEN_4ARGS], [/* dentry_open needs 4 paramters */
++#undef HAVE_DENTRY_OPEN_4ARGS])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_USER__U64_LONG_LONG])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_USER__U64_LONG_LONG$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_USER__U64_LONG_LONG], [/* userspace __u64 is long long type */
 +#undef HAVE_USER__U64_LONG_LONG])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:534: LB_PATH_DMU is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:317: LB_HAVE_EXT4_ENABLED is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
++configure.ac:20: the top level])
++m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
++aclocal.m4:583: LB_PATH_DMU is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([DMU_OSD])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^DMU_OSD$])
@@ -23159,15 +23622,6 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- AC_SUBST([subdirs], ["$subdirs m4_normalize([lustre/zfs-lustre])"])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([subdirs])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^subdirs$])
-+m4trace:configure.ac:20: -1- AC_SUBST([SPL_DIR])
-+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([SPL_DIR])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^SPL_DIR$])
-+m4trace:configure.ac:20: -1- AC_SUBST([ZFS_DIR])
-+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ZFS_DIR])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^ZFS_DIR$])
-+m4trace:configure.ac:20: -1- AC_SUBST([spl_src])
-+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([spl_src])
-+m4trace:configure.ac:20: -1- m4_pattern_allow([^spl_src$])
 +m4trace:configure.ac:20: -1- AC_CONFIG_SUBDIRS([spl])
 +m4trace:configure.ac:20: -1- AC_SUBST([subdirs], ["$subdirs m4_normalize([spl])"])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([subdirs])
@@ -23176,6 +23630,18 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- AC_SUBST([subdirs], ["$subdirs m4_normalize([zfs])"])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([subdirs])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^subdirs$])
++m4trace:configure.ac:20: -1- AC_SUBST([SPL_SUBDIR])
++m4trace:configure.ac:20: -1- AC_SUBST_TRACE([SPL_SUBDIR])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^SPL_SUBDIR$])
++m4trace:configure.ac:20: -1- AC_SUBST([ZFS_SUBDIR])
++m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ZFS_SUBDIR])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^ZFS_SUBDIR$])
++m4trace:configure.ac:20: -1- AC_SUBST([SPL_DIR])
++m4trace:configure.ac:20: -1- AC_SUBST_TRACE([SPL_DIR])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^SPL_DIR$])
++m4trace:configure.ac:20: -1- AC_SUBST([ZFS_DIR])
++m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ZFS_DIR])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^ZFS_DIR$])
 +m4trace:configure.ac:20: -1- AM_CONDITIONAL([DMU_OSD_ENABLED], [test x$dmu_osd = xyes])
 +m4trace:configure.ac:20: -1- AC_SUBST([DMU_OSD_ENABLED_TRUE])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([DMU_OSD_ENABLED_TRUE])
@@ -23193,7 +23659,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 +aclocal.m4:164: LB_PATH_LIBSYSIO is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_CONFIG_SUBDIRS([libsysio])
 +m4trace:configure.ac:20: -1- AC_SUBST([subdirs], ["$subdirs m4_normalize([libsysio])"])
@@ -23208,7 +23674,12 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 +aclocal.m4:251: LB_PATH_LDISKFS is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
++configure.ac:20: the top level])
++m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
++aclocal.m4:251: LB_PATH_LDISKFS is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([LDISKFS_DIR])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LDISKFS_DIR])
@@ -23223,6 +23694,13 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- AC_SUBST([LDISKFS_ENABLED_FALSE])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LDISKFS_ENABLED_FALSE])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LDISKFS_ENABLED_FALSE$])
++m4trace:configure.ac:20: -1- AM_CONDITIONAL([LDISKFS_IN_KERNEL], [test x$with_ldiskfs = xinkernel])
++m4trace:configure.ac:20: -1- AC_SUBST([LDISKFS_IN_KERNEL_TRUE])
++m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LDISKFS_IN_KERNEL_TRUE])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^LDISKFS_IN_KERNEL_TRUE$])
++m4trace:configure.ac:20: -1- AC_SUBST([LDISKFS_IN_KERNEL_FALSE])
++m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LDISKFS_IN_KERNEL_FALSE])
++m4trace:configure.ac:20: -1- m4_pattern_allow([^LDISKFS_IN_KERNEL_FALSE$])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_EXT4_LDISKFS])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_EXT4_LDISKFS$])
 +m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_EXT4_LDISKFS], [/* build ext4 based ldiskfs */
@@ -23234,7 +23712,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 +aclocal.m4:211: LB_PATH_LUSTREIOKIT is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([LUSTREIOKIT_SUBDIR])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LUSTREIOKIT_SUBDIR])
@@ -23245,8 +23723,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^subdirs$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:416: LB_DEFINE_E2FSPROGS_NAMES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:465: LB_DEFINE_E2FSPROGS_NAMES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDISKFSPROGS])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LDISKFSPROGS$])
@@ -23282,8 +23760,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef E2FSCK])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:416: LB_DEFINE_E2FSPROGS_NAMES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:465: LB_DEFINE_E2FSPROGS_NAMES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDISKFSPROGS])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LDISKFSPROGS$])
@@ -23319,8 +23797,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef E2FSCK])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:416: LB_DEFINE_E2FSPROGS_NAMES is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:465: LB_DEFINE_E2FSPROGS_NAMES is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDISKFSPROGS])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LDISKFSPROGS$])
@@ -23356,18 +23834,18 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef E2FSCK])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:2964: LC_CONFIG_LIBLUSTRE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:2929: LC_CONFIG_LIBLUSTRE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:2964: LC_CONFIG_LIBLUSTRE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:2929: LC_CONFIG_LIBLUSTRE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:2964: LC_CONFIG_LIBLUSTRE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:2929: LC_CONFIG_LIBLUSTRE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([LIBLUSTRE_POSIX_ACL])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBLUSTRE_POSIX_ACL$])
@@ -23375,17 +23853,17 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef LIBLUSTRE_POSIX_ACL])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:2964: LC_CONFIG_LIBLUSTRE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:2929: LC_CONFIG_LIBLUSTRE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([MPICC_WRAPPER])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([MPICC_WRAPPER])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^MPICC_WRAPPER$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:1275: LC_CONFIG_PINGER is expanded from...
-+aclocal.m4:2964: LC_CONFIG_LIBLUSTRE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:1149: LC_CONFIG_PINGER is expanded from...
++aclocal.m4:2929: LC_CONFIG_LIBLUSTRE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_PINGER])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^ENABLE_PINGER$])
@@ -23393,9 +23871,9 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef ENABLE_PINGER])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:1324: LC_CONFIG_LIBLUSTRE_RECOVERY is expanded from...
-+aclocal.m4:2964: LC_CONFIG_LIBLUSTRE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:1222: LC_CONFIG_LIBLUSTRE_RECOVERY is expanded from...
++aclocal.m4:2929: LC_CONFIG_LIBLUSTRE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_LIBLUSTRE_RECOVERY])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^ENABLE_LIBLUSTRE_RECOVERY$])
@@ -23427,8 +23905,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef HAVE_STRNLEN])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:5585: LN_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:5611: LN_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBREADLINE])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LIBREADLINE$])
@@ -23439,8 +23917,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBREADLINE$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:5585: LN_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:5611: LN_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEFENCE])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LIBEFENCE$])
@@ -23451,8 +23929,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBEFENCE$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:5585: LN_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:5611: LN_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWRAP])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LIBWRAP$])
@@ -23463,8 +23941,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBWRAP$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:5585: LN_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:5611: LN_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBPTHREAD])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_LIBPTHREAD$])
@@ -23478,8 +23956,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^ENABLE_LIBPTHREAD$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:5585: LN_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:5611: LN_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([INIT_SYSIO])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^INIT_SYSIO$])
@@ -23487,8 +23965,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef INIT_SYSIO])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:5585: LN_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:5611: LN_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([LIBLUSTRE_USE_URANDOM])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBLUSTRE_USE_URANDOM$])
@@ -23503,9 +23981,9 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^CAP_LIBS$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4061: LN_CONFIG_MAX_PAYLOAD is expanded from...
-+aclocal.m4:5585: LN_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4027: LN_CONFIG_MAX_PAYLOAD is expanded from...
++aclocal.m4:5611: LN_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([LNET_MAX_PAYLOAD])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^LNET_MAX_PAYLOAD$])
@@ -23513,10 +23991,10 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef LNET_MAX_PAYLOAD])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4180: LN_CONFIG_PORTALS is expanded from...
-+aclocal.m4:4283: LN_CONFIG_UPTLLND is expanded from...
-+aclocal.m4:5585: LN_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4146: LN_CONFIG_PORTALS is expanded from...
++aclocal.m4:4249: LN_CONFIG_UPTLLND is expanded from...
++aclocal.m4:5611: LN_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([PTLLNDCPPFLAGS])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([PTLLNDCPPFLAGS])
@@ -23526,18 +24004,18 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^UPTLLND$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:4306: LN_CONFIG_USOCKLND is expanded from...
-+aclocal.m4:5585: LN_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:4272: LN_CONFIG_USOCKLND is expanded from...
++aclocal.m4:5611: LN_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([USOCKLND])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([USOCKLND])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^USOCKLND$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:1341: LC_CONFIG_OBD_BUFFER_SIZE is expanded from...
-+aclocal.m4:3281: LC_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:1239: LC_CONFIG_OBD_BUFFER_SIZE is expanded from...
++aclocal.m4:3246: LC_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([OBD_MAX_IOCTL_BUFFER])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^OBD_MAX_IOCTL_BUFFER$])
@@ -23575,9 +24053,9 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef HAVE_INET_NTOA])
 +m4trace:configure.ac:20: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
-+aclocal.m4:1378: LC_READLINK_SSIZE_T is expanded from...
-+aclocal.m4:3281: LC_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:1276: LC_READLINK_SSIZE_T is expanded from...
++aclocal.m4:3246: LC_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_POSIX_1003_READLINK])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_POSIX_1003_READLINK$])
@@ -23598,8 +24076,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^ZLIB$])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3281: LC_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3246: LC_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([MIN_DF])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^MIN_DF$])
@@ -23607,8 +24085,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef MIN_DF])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:3281: LC_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:3246: LC_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([RANDOM_FAIL_ALLOC])
 +m4trace:configure.ac:20: -1- m4_pattern_allow([^RANDOM_FAIL_ALLOC$])
@@ -23616,8 +24094,8 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +#undef RANDOM_FAIL_ALLOC])
 +m4trace:configure.ac:20: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:5926: LS_CONFIGURE is expanded from...
-+aclocal.m4:894: LB_CONFIGURE is expanded from...
++aclocal.m4:5952: LS_CONFIGURE is expanded from...
++aclocal.m4:946: LB_CONFIGURE is expanded from...
 +configure.ac:20: the top level])
 +m4trace:configure.ac:20: -1- AC_SUBST([NET_SNMP_CONFIG])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([NET_SNMP_CONFIG])
@@ -23950,6 +24428,7 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +lustre/kernel_patches/targets/rhel-2.4.target
 +lustre/kernel_patches/targets/suse-2.4.21-2.target
 +lustre/kernel_patches/targets/sles-2.4.target
++lustre/kernel_patches/targets/2.6-oel5.target
 +lustre/ldlm/Makefile
 +lustre/liblustre/Makefile
 +lustre/liblustre/tests/Makefile
@@ -24014,156 +24493,154 @@ diff -Nurwd lustre-1.8.1.orig/autom4te.cache/traces.0 lustre-1.8.1/autom4te.cach
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([abs_builddir])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([abs_top_builddir])
 +m4trace:configure.ac:20: -1- AC_SUBST_TRACE([INSTALL])
-diff -Nurwd lustre-1.8.1.orig/autoMakefile.in lustre-1.8.1/autoMakefile.in
---- lustre-1.8.1.orig/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/autoMakefile.in	2009-09-10 11:16:56.000000000 +0200
-@@ -122,12 +122,11 @@
- EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
- EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
--EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
--EXTRA_KLIBS = @EXTRA_KLIBS@
- EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
- GMCPPFLAGS = @GMCPPFLAGS@
- GMLIBS = @GMLIBS@
- GMLND = @GMLND@
-+GREP = @GREP@
- IIBCPPFLAGS = @IIBCPPFLAGS@
- IIBLND = @IIBLND@
- INCLUDE_RULES = @INCLUDE_RULES@
-@@ -239,8 +238,6 @@
- ZLIB = @ZLIB@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- agentdir = @agentdir@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -254,8 +251,10 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- demodir = @demodir@
- docdir = @docdir@
-+dvidir = @dvidir@
- enable_uoss = @enable_uoss@
- exec_prefix = @exec_prefix@
- host = @host@
-@@ -263,26 +262,27 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--kextdir = @kextdir@
- lb_target_os = @lb_target_os@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
--macosdir = @macosdir@
- mandir = @mandir@
- mibdir = @mibdir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pkgexampledir = @pkgexampledir@
--plistdir = @plistdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- rootsbindir = @rootsbindir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-@@ -298,7 +298,6 @@
- DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre 
- SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
- RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
-- at LDISKFS_ENABLED_TRUE@EXTRA_SOURCES := @SYMVERFILE@
- 
- AUTOMAKE_OPTIONS = foreign
- 
-@@ -306,6 +305,7 @@
- 
- @LINUX25_FALSE@@LINUX_TRUE@@MODULES_TRUE at CLEANFILES = .depend
- 
-+#EXTRA_SOURCES := @SYMVERFILE@
- EXTRA_DIST = @PACKAGE_TARNAME at .spec					\
- 	build/Makefile build/autoMakefile.am.toplevel build/lbuild	\
- 	build/linux-merge-config.awk build/linux-merge-modules.awk	\
-@@ -327,6 +327,8 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = Makefile Rules lustre.spec \
-+	lnet/include/libcfs/darwin/Makefile \
-+	lnet/include/lnet/darwin/Makefile lnet/libcfs/darwin/Makefile \
- 	lustre/kernel_patches/targets/2.6-suse.target \
- 	lustre/kernel_patches/targets/2.6-vanilla.target \
- 	lustre/kernel_patches/targets/2.6-rhel4.target \
-@@ -339,7 +341,8 @@
- 	lustre/kernel_patches/targets/rh-2.4.target \
- 	lustre/kernel_patches/targets/rhel-2.4.target \
- 	lustre/kernel_patches/targets/suse-2.4.21-2.target \
--	lustre/kernel_patches/targets/sles-2.4.target
-+	lustre/kernel_patches/targets/sles-2.4.target \
-+	lustre/obdclass/darwin/Makefile
- DIST_SOURCES =
- 
- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-@@ -350,8 +353,9 @@
- DIST_COMMON = README $(srcdir)/autoMakefile.in \
- 	$(srcdir)/build/autoMakefile.am.toplevel $(srcdir)/configure \
- 	COPYING ChangeLog Makefile.in aclocal.m4 autoMakefile.am \
--	compile config.guess config.h.in config.sub configure.ac \
--	depcomp install-sh lustre.spec.in missing mkinstalldirs
-+	compile config.guess config.h.in config.sub configure \
-+	configure.ac depcomp install-sh lustre.spec.in missing \
-+	mkinstalldirs
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+diff -Nurwd orig/lustre-1.8.2/build/autoconf/lustre-build.m4 lustre-1.8.2/build/autoconf/lustre-build.m4
+--- orig/lustre-1.8.2/build/autoconf/lustre-build.m4	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/build/autoconf/lustre-build.m4	2010-03-03 15:57:14.919642480 +0000
+@@ -816,7 +816,7 @@
+ 	CC="$CC -m64"
+ fi
  
-@@ -395,6 +399,12 @@
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- lustre.spec: $(top_builddir)/config.status lustre.spec.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
-+lnet/include/libcfs/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/include/libcfs/darwin/Makefile.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+lnet/include/lnet/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/include/lnet/darwin/Makefile.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+lnet/libcfs/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/libcfs/darwin/Makefile.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
- lustre/kernel_patches/targets/2.6-suse.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/2.6-suse.target.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- lustre/kernel_patches/targets/2.6-vanilla.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/2.6-vanilla.target.in
-@@ -421,6 +431,8 @@
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- lustre/kernel_patches/targets/sles-2.4.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/sles-2.4.target.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
-+lustre/obdclass/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lustre/obdclass/darwin/Makefile.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
- uninstall-info-am:
+-CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
++CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$TOP_DIR/lnet/include -I$TOP_DIR/lustre/include -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
  
- # This directory's subdirectories are mostly independent; you can cd
-@@ -536,7 +548,7 @@
- distdir: $(DISTFILES)
- 	$(am__remove_distdir)
- 	mkdir $(distdir)
--	$(mkinstalldirs) $(distdir)/. $(distdir)/./build $(distdir)/build $(distdir)/build/autoconf $(distdir)/lnet $(distdir)/lnet/klnds $(distdir)/lnet/klnds/ciblnd $(distdir)/lnet/klnds/gmlnd $(distdir)/lnet/klnds/iiblnd $(distdir)/lnet/klnds/mxlnd $(distdir)/lnet/klnds/o2iblnd $(distdir)/lnet/klnds/openiblnd $(distdir)/lnet/klnds/ptllnd $(distdir)/lnet/klnds/qswlnd $(distdir)/lnet/klnds/ralnd $(distdir)/lnet/klnds/socklnd $(distdir)/lnet/klnds/viblnd $(distdir)/lnet/libcfs $(distdir)/lnet/lnet $(distdir)/lnet/selftest $(distdir)/lnet/ulnds $(distdir)/lustre $(distdir)/lustre/include $(distdir)/lustre/kernel_patches/targets $(distdir)/lustre/llite $(distdir)/lustre/lov $(distdir)/lustre/lvfs $(distdir)/lustre/mdc $(distdir)/lustre/mds $(distdir)/lustre/mgc $(distdir)/lustre/mgs $(distdir)/lustre/obdclass $(distdir)/lustre/obdecho $(distdir)/lustre/obdfilter $(distdir)/lustre/osc $(distdir)/lustre/ost $(distdir)/lustre/ptlrpc $(distdir)/lustre/quota
-+	$(mkinstalldirs) $(distdir)/. $(distdir)/./build $(distdir)/build $(distdir)/build/autoconf $(distdir)/lnet $(distdir)/lnet/include/libcfs/darwin $(distdir)/lnet/include/lnet/darwin $(distdir)/lnet/klnds $(distdir)/lnet/klnds/ciblnd $(distdir)/lnet/klnds/gmlnd $(distdir)/lnet/klnds/iiblnd $(distdir)/lnet/klnds/mxlnd $(distdir)/lnet/klnds/o2iblnd $(distdir)/lnet/klnds/openiblnd $(distdir)/lnet/klnds/ptllnd $(distdir)/lnet/klnds/qswlnd $(distdir)/lnet/klnds/ralnd $(distdir)/lnet/klnds/socklnd $(distdir)/lnet/klnds/viblnd $(distdir)/lnet/libcfs $(distdir)/lnet/libcfs/darwin $(distdir)/lnet/lnet $(distdir)/lnet/selftest $(distdir)/lnet/ulnds $(distdir)/lustre $(distdir)/lustre/include $(distdir)/lustre/kernel_patches/targets $(distdir)/lustre/llite $(distdir)/lustre/lov $(distdir)/lustre/lvfs $(distdir)/lustre/mdc $(distdir)/lustre/mds $(distdir)/lustre/mgc $(distdir)/lustre/mgs $(distdir)/lustre/obdclass $(distdir)/lustre/obdclass/darwin $(distdir)/lustre/obdecho $(distdir)/lustre/obdfilter $(distdir)/lustre/osc $(distdir)/lustre/ost $(distdir)/lustre/ptlrpc $(distdir)/lustre/quota
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
-diff -Nurwd lustre-1.8.1.orig/config.h.in lustre-1.8.1/config.h.in
---- lustre-1.8.1.orig/config.h.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/config.h.in	2009-09-10 11:16:55.000000000 +0200
-@@ -213,9 +213,6 @@
+ LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
+ AC_SUBST(LLCPPFLAGS)
+diff -Nurwd orig/lustre-1.8.2/build/autogen.sh lustre-1.8.2/build/autogen.sh
+--- orig/lustre-1.8.2/build/autogen.sh	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/build/autogen.sh	2010-03-03 15:57:14.815634149 +0000
+@@ -0,0 +1,128 @@
++#!/bin/bash
++
++# taken from gnome-common/macros2/autogen.sh
++compare_versions() {
++    ch_min_version=$1
++    ch_actual_version=$2
++    ch_status=0
++    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
++    set $ch_actual_version
++    for ch_min in $ch_min_version; do
++        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
++        if [ -z "$ch_min" ]; then break; fi
++        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
++        if [ $ch_cur -gt $ch_min ]; then break; fi
++        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
++    done
++    IFS="$ch_save_IFS"
++    return $ch_status
++}
++
++error_msg() {
++	echo "$cmd is $1.  version $required is required to build Lustre."
++
++	if [ -e /usr/lib/autolustre/bin/$cmd ]; then
++		cat >&2 <<-EOF
++		You apparently already have Lustre-specific autoconf/make RPMs
++		installed on your system at /usr/lib/autolustre/share/$cmd.
++		Please set your PATH to point to those versions:
++
++		export PATH="/usr/lib/autolustre/bin:\$PATH"
++		EOF
++	else
++		cat >&2 <<-EOF
++		CFS provides RPMs which can be installed alongside your
++		existing autoconf/make RPMs, if you are nervous about
++		upgrading.  See
++
++		ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
++
++		You may be able to download newer version from:
++
++		http://ftp.gnu.org/gnu/$tool/$tool-$required.tar.gz
++	EOF
++	fi
++	[ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
++
++or for RH9 systems you can use:
++
++ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
++EOF
++	[ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
++
++or for RH9 systems you can use:
++
++ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
++EOF
++	exit 1
++}
++
++check_version() {
++    local tool
++    local cmd
++    local required
++    local version
++
++    tool=$1
++    cmd=$2
++    required=$3
++    echo -n "checking for $cmd $required... "
++    if ! $cmd --version >/dev/null ; then
++	error_msg "missing"
++    fi
++    version=$($cmd --version | awk "/$tool \(GNU/ { print \$4 }")
++    echo "found $version"
++    if ! compare_versions "$required" "$version" ; then
++	error_msg "too old"
++    fi
++}
++
++echo "Checking for a complete tree..."
++if [ -d kernel_patches ] ; then
++    # This is ldiskfs
++    REQUIRED_DIRS="build"
++    CONFIGURE_DIRS=""
++else
++    REQUIRED_DIRS="build lnet lustre"
++    OPTIONAL_DIRS="snmp portals"
++    CONFIGURE_DIRS="libsysio ldiskfs"
++fi
++
++for dir in $REQUIRED_DIRS ; do
++    if [ ! -d "$dir" ] ; then
++	cat >&2 <<EOF
++Your tree seems to be missing $dir.
++Please read README.lustrecvs for details.
++EOF
++	exit 1
++    fi
++    ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
++done
++# optional directories for Lustre
++for dir in $OPTIONAL_DIRS; do
++    if [ -d "$dir" ] ; then
++	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
++    fi
++done
++
++check_version automake automake-1.7 "1.7.8"
++check_version autoconf autoconf "2.57"
++
++echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
++aclocal-1.7 $ACLOCAL_FLAGS || exit 1
++echo "Running autoheader..."
++autoheader || exit 1
++echo "Running automake-1.7..."
++automake-1.7 -a -c || exit 1
++echo "Running autoconf..."
++autoconf || exit 1
++
++# Run autogen.sh in these directories
++for dir in $CONFIGURE_DIRS; do
++    if [ -d $dir ] ; then
++        pushd $dir >/dev/null
++        echo "Running autogen for $dir..."
++        sh autogen.sh || exit $?
++        popd >/dev/null
++    fi
++done
+diff -Nurwd orig/lustre-1.8.2/config.h.in lustre-1.8.2/config.h.in
+--- orig/lustre-1.8.2/config.h.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/config.h.in	2010-03-03 16:00:10.179641581 +0000
+@@ -222,9 +222,6 @@
  /* Define to 1 if you have the `gethostbyname' function. */
  #undef HAVE_GETHOSTBYNAME
  
@@ -24173,19 +24650,19 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in lustre-1.8.1/config.h.in
  /* gfp_t found */
  #undef HAVE_GFP_T
  
-@@ -633,7 +630,7 @@
- /* enable randomly alloc failure */
- #undef RANDOM_FAIL_ALLOC
+@@ -645,7 +642,7 @@
+ /* kernel using unsigned for shrinker callback */
+ #undef SHRINKER_MASK_T
  
 -/* The size of a `unsigned long long', as computed by sizeof. */
 +/* The size of `unsigned long long', as computed by sizeof. */
  #undef SIZEOF_UNSIGNED_LONG_LONG
  
  /* use tunable backoff TCP */
-diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
---- lustre-1.8.1.orig/config.h.in~	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/config.h.in~	2009-07-25 00:28:40.000000000 +0200
-@@ -0,0 +1,658 @@
+diff -Nurwd orig/lustre-1.8.2/config.h.in~ lustre-1.8.2/config.h.in~
+--- orig/lustre-1.8.2/config.h.in~	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/config.h.in~	2010-03-03 13:43:00.000000000 +0000
+@@ -0,0 +1,670 @@
 +/* config.h.in.  Generated from configure.ac by autoheader.  */
 +
 +/* disable libcfs CDEBUG, CWARN */
@@ -24206,9 +24683,6 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* build ldiskfs as a module */
 +#undef CONFIG_LDISKFS_FS_MODULE
 +
-+/* enable fs security for ldiskfs */
-+#undef CONFIG_LDISKFS_FS_NFS4ACL
-+
 +/* enable posix acls for ldiskfs */
 +#undef CONFIG_LDISKFS_FS_POSIX_ACL
 +
@@ -24263,6 +24737,9 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* vfs_symlink wants 4 args */
 +#undef HAVE_4ARGS_VFS_SYMLINK
 +
++/* kernel exports add_to_page_cache_lru */
++#undef HAVE_ADD_TO_PAGE_CACHE_LRU
++
 +/* support alder32 checksum type */
 +#undef HAVE_ADLER
 +
@@ -24275,6 +24752,12 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* Define to 1 if you have the <asm/types.h> header file. */
 +#undef HAVE_ASM_TYPES_H
 +
++/* kernel has atomic_cmpxchg */
++#undef HAVE_ATOMIC_CMPXCHG
++
++/* kernel has atomic_inc_not_zero */
++#undef HAVE_ATOMIC_INC_NOT_ZERO
++
 +/* panic_notifier_list is atomic_notifier_head */
 +#undef HAVE_ATOMIC_PANIC_NOTIFIER
 +
@@ -24293,12 +24776,12 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* struct bio has a bi_hw_segments field */
 +#undef HAVE_BI_HW_SEGMENTS
 +
++/* blkdev_put needs 2 paramters */
++#undef HAVE_BLKDEV_PUT_2ARGS
++
 +/* Define to 1 if you have the <blkid/blkid.h> header file. */
 +#undef HAVE_BLKID_BLKID_H
 +
-+/* kernel expects return from shrink_cache */
-+#undef HAVE_CACHE_RETURN_INT
-+
 +/* call_rcu takes three parameters */
 +#undef HAVE_CALL_RCU_PARAM
 +
@@ -24326,6 +24809,9 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* Enable delayed recovery support */
 +#undef HAVE_DELAYED_RECOVERY
 +
++/* dentry_open needs 4 paramters */
++#undef HAVE_DENTRY_OPEN_4ARGS
++
 +/* kernel has new dev_set_rdonly */
 +#undef HAVE_DEV_SET_RDONLY
 +
@@ -24341,6 +24827,9 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* d_move_locked is exported by the kernel */
 +#undef HAVE_D_MOVE_LOCKED
 +
++/* d_obtain_alias exist in kernel */
++#undef HAVE_D_OBTAIN_ALIAS
++
 +/* d_rehash_cond is exported by the kernel */
 +#undef HAVE_D_REHASH_COND
 +
@@ -24362,9 +24851,6 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* kernel has .fh_to_dentry member in export_operations struct */
 +#undef HAVE_FH_TO_DENTRY
 +
-+/* filemap_fdatawrite() found */
-+#undef HAVE_FILEMAP_FDATAWRITE
-+
 +/* filemap_fdatawrite_range is exported by the kernel */
 +#undef HAVE_FILEMAP_FDATAWRITE_RANGE
 +
@@ -24407,7 +24893,7 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* gfp_t found */
 +#undef HAVE_GFP_T
 +
-+/* kernel has grab_cache_page_nowait_gfp() */
++/* kernel exports grab_cache_page_nowait_gfp */
 +#undef HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP
 +
 +/* Define to 1 if you have the `inet_ntoa' function. */
@@ -24440,15 +24926,15 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* exported invalidate_mapping_pages */
 +#undef HAVE_INVALIDATE_MAPPING_PAGES
 +
-+/* struct inode has i_alloc_sem */
-+#undef HAVE_I_ALLOC_SEM
-+
 +/* kernel has .sendfile */
 +#undef HAVE_KERNEL_SENDFILE
 +
 +/* kernel has .slice_read */
 +#undef HAVE_KERNEL_SPLICE_READ
 +
++/* kernel has .write_begin/end */
++#undef HAVE_KERNEL_WRITE_BEGIN_END
++
 +/* kernel __u64 is long long type */
 +#undef HAVE_KERN__U64_LONG_LONG
 +
@@ -24464,6 +24950,9 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* enable use of ldiskfsprogs package */
 +#undef HAVE_LDISKFSPROGS
 +
++/* ldiskfs/xattr.h found */
++#undef HAVE_LDISKFS_XATTR_H
++
 +/* __le16 and __le32 types are defined */
 +#undef HAVE_LE_TYPES
 +
@@ -24482,9 +24971,15 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* libwrap support is requested */
 +#undef HAVE_LIBWRAP
 +
++/* kernel has include/linux/cred.h */
++#undef HAVE_LINUX_CRED_H
++
 +/* kernel has include/exportfs.h */
 +#undef HAVE_LINUX_EXPORTFS_H
 +
++/* Kernel has fiemap.h */
++#undef HAVE_LINUX_FIEMAP_H
++
 +/* kernel has include/mm_types.h */
 +#undef HAVE_LINUX_MMTYPES_H
 +
@@ -24512,9 +25007,6 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* Define to 1 if you have the <memory.h> header file. */
 +#undef HAVE_MEMORY_H
 +
-+/* mm_inline found */
-+#undef HAVE_MM_INLINE
-+
 +/* kernel has MS_FLOCK_LOCK flag */
 +#undef HAVE_MS_FLOCK_LOCK
 +
@@ -24557,8 +25049,8 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* struct page has a list field */
 +#undef HAVE_PAGE_LIST
 +
-+/* page_mapped found */
-+#undef HAVE_PAGE_MAPPED
++/* kernel has a remove suid that takes a struct path */
++#undef HAVE_PATH_REMOVE_SUID
 +
 +/* percpu_counter_init has two arguments */
 +#undef HAVE_PERCPU_2ND_ARG
@@ -24599,10 +25091,7 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* super_operations has a read_inode */
 +#undef HAVE_READ_INODE_IN_SBOPS
 +
-+/* register_cache found */
-+#undef HAVE_REGISTER_CACHE
-+
-+/* if kernel has register_shrinker */
++/* kernel exports register_shrinker */
 +#undef HAVE_REGISTER_SHRINKER
 +
 +/* releasepage with gfp_t parameter */
@@ -24629,9 +25118,6 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* show_task is exported */
 +#undef HAVE_SHOW_TASK
 +
-+/* shrinker_cache found */
-+#undef HAVE_SHRINKER_CACHE
-+
 +/* size_t is long type */
 +#undef HAVE_SIZE_T_LONG
 +
@@ -24668,6 +25154,9 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* Define to 1 if you have the `strnlen' function. */
 +#undef HAVE_STRNLEN
 +
++/* struct cred found */
++#undef HAVE_STRUCT_CRED
++
 +/* in 2.6.12 synchronize_rcu preferred over synchronize_kernel */
 +#undef HAVE_SYNCHRONIZE_RCU
 +
@@ -24698,9 +25187,6 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* tasklist_lock exported */
 +#undef HAVE_TASKLIST_LOCK
 +
-+/* task p_pptr found */
-+#undef HAVE_TASK_PPTR
-+
 +/* task_struct has rcu field */
 +#undef HAVE_TASK_RCU
 +
@@ -24722,12 +25208,12 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* Define to 1 if you have the <unistd.h> header file. */
 +#undef HAVE_UNISTD_H
 +
-+/* struct file_operations has an unlock ed_ioctl field */
-+#undef HAVE_UNLOCKED_IOCTL
-+
 +/* unregister_blkdev return int */
 +#undef HAVE_UNREGISTER_BLKDEV_RETURN_INT
 +
++/* unshare_fs_struct found */
++#undef HAVE_UNSHARE_FS_STRUCT
++
 +/* userspace __u64 is long long type */
 +#undef HAVE_USER__U64_LONG_LONG
 +
@@ -24821,6 +25307,9 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +/* enable randomly alloc failure */
 +#undef RANDOM_FAIL_ALLOC
 +
++/* kernel using unsigned for shrinker callback */
++#undef SHRINKER_MASK_T
++
 +/* The size of a `unsigned long long', as computed by sizeof. */
 +#undef SIZEOF_UNSIGNED_LONG_LONG
 +
@@ -24844,9 +25333,9 @@ diff -Nurwd lustre-1.8.1.orig/config.h.in~ lustre-1.8.1/config.h.in~
 +
 +/* Version number of package */
 +#undef VERSION
-diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
---- lustre-1.8.1.orig/configure	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/configure	2009-09-10 11:17:08.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/configure lustre-1.8.2/configure
+--- orig/lustre-1.8.2/configure	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/configure	2010-03-03 16:00:15.640632502 +0000
 @@ -1,27 +1,56 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -25529,7 +26018,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  # Identity of this package.
  PACKAGE_NAME='Lustre'
  PACKAGE_TARNAME='lustre'
-@@ -278,48 +583,309 @@
+@@ -278,48 +583,312 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -25584,7 +26073,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 -ac_subdirs_all="$ac_subdirs_all libsysio"
 -ac_subdirs_all="$ac_subdirs_all ldiskfs"
 -ac_subdirs_all="$ac_subdirs_all lustre-iokit"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AC_LUSTRE_MAJOR AC_LUSTRE_MINOR AC_LUSTRE_PATCH AC_LUSTRE_FIX AC_LUSTRE_VERSION_STRING AC_LUSTRE_VER_ALLOWED_OFFSET AC_LUSTRE_LIB_VER_OFFSET_WARN AC_LUSTRE_CLI_VER_OFFSET_WARN AC_LUSTRE_CLIENT_URN AC_LUSTRE_MDS_URN AC_LUSTRE_MGS_URN AC_LUSTRE_OSS_URN LDISKFS_ENABLED_TRUE LDISKFS_ENABLED_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE lb_target_os LIBCFS_SUBDIR LIBCFS_INCLUDE_DIR INCLUDE_RULES docdir LUSTRE rootsbindir demodir pkgexampledir RANLIB ac_ct_RANLIB CPP EGREP LLCPPFLAGS LLCFLAGS EXTRA_KCFLAGS enable_uoss POSIX_OSD_ENABLED_TRUE POSIX_OSD_ENABLED_FALSE ENABLE_DOC ENABLE_INIT_SCRIPTS LINUX LINUX_OBJ LINUX_CONFIG ARCH_UM UML_CFLAGS MODULE_TARGET linux25 KMODEXT LINUXRELEASE moduledir modulefsdir modulenetdir RELEASE SYMVERFILE QSWCPPFLAGS QSWLND GMCPPFLAGS GMLIBS GMLND OPENIBCPPFLAGS OPENIBLND CIBCPPFLAGS CIBLND VIBCPPFLAGS VIBLND IIBCPPFLAGS IIBLND EXTRA_LNET_INCLUDE O2IBCPPFLAGS O2IBLND RACPPFLAGS RALND PTLLNDCPPFLAGS PTLLND MXCPPFLAGS MXLIBS MXLND BACKINGFS EXTRA_KLDFLAGS EXTRA_KLIBS kextdir plistdir macosdir DMU_SRC subdirs SPL_DIR ZFS_DIR spl_src DMU_OSD_ENABLED_TRUE DMU_OSD_ENABLED_FALSE KDMU_TRUE KDMU_FALSE SNMP_DIST_SUBDIR SNMP_SUBDIR LDISKFS_DIR LDISKFS_SUBDIR LUSTREIOKIT_SUBDIR MPICC_WRAPPER LIBREADLINE LIBEFENCE LIBWRAP PTHREAD_LIBS ENABLE_LIBPTHREAD CAP_LIBS UPTLLND USOCKLND ZLIB NET_SNMP_CONFIG NET_SNMP_CFLAGS NET_SNMP_LIBS agentdir mibdir MODULES_TRUE MODULES_FALSE UTILS_TRUE UTILS_FALSE TESTS_TRUE TESTS_FALSE DOC_TRUE DOC_FALSE INIT_SCRIPTS_TRUE INIT_SCRIPTS_FALSE LINUX_TRUE LINUX_FALSE DARWIN_TRUE DARWIN_FALSE CRAY_XT3_TRUE CRAY_XT3_FALSE SUNOS_TRUE SUNOS_FALSE LIBSYSIO_SUBDIR SYSIO LINUX25_TRUE LINUX25_FALSE BUILD_QSWLND_TRUE BUILD_QSWLND_FALSE BUILD_GMLND_TRUE BUILD_GMLND_FALSE BUILD_MXLND_TRUE BUILD_MXLND_FALSE BUILD_O2IBLND_TRUE BUILD_O2IBLND_FALSE BUILD_OPENIBLND_TRUE BUILD_OPENIBLND_FALSE BUILD_CIBLND_TRUE BUILD_CIBLND_FALSE BUILD_IIBLND_TRUE BUILD_IIBLND_FALSE BUILD_VIBLND_TRUE BUILD_VIBLND_FALSE BUILD_RALND_TRUE BUILD_RALND_FALSE BUILD_PTLLND_TRUE BUILD_PTLLND_FALSE BUILD_UPTLLND_TRUE BUILD_UPTLLND_FALSE BUILD_USOCKLND_TRUE BUILD_USOCKLND_FALSE LIBLUSTRE_TRUE LIBLUSTRE_FALSE USE_QUILT_TRUE USE_QUILT_FALSE LIBLUSTRE_TESTS_TRUE LIBLUSTRE_TESTS_FALSE MPITESTS_TRUE MPITESTS_FALSE CLIENT_TRUE CLIENT_FALSE SERVER_TRUE SERVER_FALSE QUOTA_TRUE QUOTA_FALSE BLKID_TRUE BLKID_FALSE EXT2FS_DEVEL_TRUE EXT2FS_DEVEL_FALSE LIBPTHREAD_TRUE LIBPTHREAD_FALSE ac_configure_args MOSTLYCLEANFILES LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AC_LUSTRE_MAJOR AC_LUSTRE_MINOR AC_LUSTRE_PATCH AC_LUSTRE_FIX AC_LUSTRE_VERSION_STRING AC_LUSTRE_VER_ALLOWED_OFFSET AC_LUSTRE_LIB_VER_OFFSET_WARN AC_LUSTRE_CLI_VER_OFFSET_WARN AC_LUSTRE_CLIENT_URN AC_LUSTRE_MDS_URN AC_LUSTRE_MGS_URN AC_LUSTRE_OSS_URN LDISKFS_ENABLED_TRUE LDISKFS_ENABLED_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE lb_target_os LIBCFS_SUBDIR LIBCFS_INCLUDE_DIR INCLUDE_RULES docdir LUSTRE rootsbindir demodir pkgexampledir RANLIB ac_ct_RANLIB CPP EGREP LLCPPFLAGS LLCFLAGS EXTRA_KCFLAGS enable_uoss POSIX_OSD_ENABLED_TRUE POSIX_OSD_ENABLED_FALSE ENABLE_DOC ENABLE_INIT_SCRIPTS LINUX LINUX_OBJ LINUX_CONFIG ARCH_UM UML_CFLAGS MODULE_TARGET linux25 KMODEXT LINUXRELEASE moduledir modulefsdir modulenetdir RELEASE SYMVERFILE QSWCPPFLAGS QSWLND GMCPPFLAGS GMLIBS GMLND OPENIBCPPFLAGS OPENIBLND CIBCPPFLAGS CIBLND VIBCPPFLAGS VIBLND IIBCPPFLAGS IIBLND EXTRA_LNET_INCLUDE O2IBCPPFLAGS O2IBLND RACPPFLAGS RALND PTLLNDCPPFLAGS PTLLND MXCPPFLAGS MXLIBS MXLND BACKINGFS EXTRA_KLDFLAGS EXTRA_KLIBS kextdir plistdir macosdir DMU_SRC subdirs SPL_SUBDIR ZFS_SUBDIR SPL_DIR ZFS_DIR DMU_OSD_ENABLED_TRUE DMU_OSD_ENABLED_FALSE KDMU_TRUE KDMU_FALSE SNMP_DIST_SUBDIR SNMP_SUBDIR LDISKFS_DIR LDISKFS_SUBDIR LDISKFS_IN_KERNEL_TRUE LDISKFS_IN_KERNEL_FALSE LUSTREIOKIT_SUBDIR MPICC_WRAPPER LIBREADLINE LIBEFENCE LIBWRAP PTHREAD_LIBS ENABLE_LIBPTHREAD CAP_LIBS UPTLLND USOCKLND ZLIB NET_SNMP_CONFIG NET_SNMP_CFLAGS NET_SNMP_LIBS agentdir mibdir MODULES_TRUE MODULES_FALSE UTILS_TRUE UTILS_FALSE TESTS_TRUE TESTS_FALSE DOC_TRUE DOC_FALSE INIT_SCRIPTS_TRUE INIT_SCRIPTS_FALSE LINUX_TRUE LINUX_FALSE DARWIN_TRUE DARWIN_FALSE CRAY_XT3_TRUE CRAY_XT3_FALSE SUNOS_TRUE SUNOS_FALSE LIBSYSIO_SUBDIR SYSIO LINUX25_TRUE LINUX25_FALSE BUILD_QSWLND_TRUE BUILD_QSWLND_FALSE BUILD_GMLND_TRUE BUILD_GMLND_FALSE BUILD_MXLND_TRUE BUILD_MXLND_FALSE BUILD_O2IBLND_TRUE BUILD_O2IBLND_FALSE BUILD_OPENIBLND_TRUE BUILD_OPENIBLND_FALSE BUILD_CIBLND_TRUE BUILD_CIBLND_FALSE BUILD_IIBLND_TRUE BUILD_IIBLND_FALSE BUILD_VIBLND_TRUE BUILD_VIBLND_FALSE BUILD_RALND_TRUE BUILD_RALND_FALSE BUILD_PTLLND_TRUE BUILD_PTLLND_FALSE BUILD_UPTLLND_TRUE BUILD_UPTLLND_FALSE BUILD_USOCKLND_TRUE BUILD_USOCKLND_FALSE LIBLUSTRE_TRUE LIBLUSTRE_FALSE USE_QUILT_TRUE USE_QUILT_FALSE LIBLUSTRE_TESTS_TRUE LIBLUSTRE_TESTS_FALSE MPITESTS_TRUE MPITESTS_FALSE CLIENT_TRUE CLIENT_FALSE SERVER_TRUE SERVER_FALSE QUOTA_TRUE QUOTA_FALSE BLKID_TRUE BLKID_FALSE EXT2FS_DEVEL_TRUE EXT2FS_DEVEL_FALSE LIBPTHREAD_TRUE LIBPTHREAD_FALSE ac_configure_args MOSTLYCLEANFILES LIBOBJS LTLIBOBJS'
 +ac_subst_vars='SHELL
 +PATH_SEPARATOR
 +PACKAGE_NAME
@@ -25742,9 +26231,10 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +BACKINGFS
 +DMU_SRC
 +subdirs
++SPL_SUBDIR
++ZFS_SUBDIR
 +SPL_DIR
 +ZFS_DIR
-+spl_src
 +DMU_OSD_ENABLED_TRUE
 +DMU_OSD_ENABLED_FALSE
 +KDMU_TRUE
@@ -25753,6 +26243,8 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +SNMP_SUBDIR
 +LDISKFS_DIR
 +LDISKFS_SUBDIR
++LDISKFS_IN_KERNEL_TRUE
++LDISKFS_IN_KERNEL_FALSE
 +LUSTREIOKIT_SUBDIR
 +MPICC_WRAPPER
 +LIBREADLINE
@@ -25858,7 +26350,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -346,34 +912,48 @@
+@@ -346,34 +915,48 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -25914,7 +26406,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -395,33 +975,45 @@
+@@ -395,33 +978,45 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -25973,7 +26465,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -448,6 +1040,12 @@
+@@ -448,6 +1043,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -25986,7 +26478,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -472,13 +1070,16 @@
+@@ -472,13 +1073,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -26007,7 +26499,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -543,6 +1144,16 @@
+@@ -543,6 +1147,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -26024,7 +26516,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -595,24 +1206,20 @@
+@@ -595,24 +1209,20 @@
    -with-* | --with-*)
      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -26055,7 +26547,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
    --x)
      # Obsolete; use --with-x.
-@@ -643,8 +1250,7 @@
+@@ -643,8 +1253,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -26065,7 +26557,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      export $ac_envvar ;;
  
    *)
-@@ -664,27 +1270,19 @@
+@@ -664,27 +1273,19 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -26103,7 +26595,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -711,74 +1309,76 @@
+@@ -711,74 +1312,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -26230,7 +26722,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  #
  # Report the --help message.
-@@ -807,9 +1407,6 @@
+@@ -807,9 +1410,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -26240,7 +26732,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -827,15 +1424,22 @@
+@@ -827,15 +1427,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -26266,7 +26758,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  _ACEOF
  
    cat <<\_ACEOF
-@@ -861,6 +1465,7 @@
+@@ -861,6 +1468,7 @@
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -26274,7 +26766,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    --disable-dependency-tracking Speeds up one-time builds
    --enable-dependency-tracking  Do not reject slow dependency extractors
    --enable-cray-xt3       enable building of Cray XT3 features
-@@ -875,7 +1480,6 @@
+@@ -875,7 +1483,6 @@
    --disable-libcfs-cdebug disable libcfs CDEBUG, CWARN
    --disable-libcfs-trace  disable libcfs ENTRY/EXIT
    --disable-libcfs-assert disable libcfs LASSERT, LASSERTF
@@ -26282,7 +26774,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    --disable-modules       disable building of Lustre kernel modules
    --disable-affinity      disable process/irq affinity
    --disable-backoff       disable socknal tunable backoff
-@@ -951,8 +1555,9 @@
+@@ -953,8 +1560,9 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -26294,7 +26786,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    CPP         C preprocessor
  
  Use these variables to override the choices made by `configure' or to help
-@@ -960,120 +1565,86 @@
+@@ -962,120 +1570,86 @@
  
  Report bugs to <https://bugzilla.lustre.org/>.
  _ACEOF
@@ -26460,7 +26952,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1092,7 +1663,7 @@
+@@ -1094,7 +1668,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -26469,7 +26961,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1106,6 +1677,7 @@
+@@ -1108,6 +1682,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -26477,7 +26969,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  } >&5
  
-@@ -1127,7 +1699,6 @@
+@@ -1129,7 +1704,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -26485,7 +26977,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1138,7 +1709,7 @@
+@@ -1140,7 +1714,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -26494,7 +26986,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1160,9 +1731,7 @@
+@@ -1162,9 +1736,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -26505,7 +26997,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
        ;;
      esac
    done
-@@ -1173,8 +1742,8 @@
+@@ -1175,8 +1747,8 @@
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -26516,7 +27008,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1187,20 +1756,34 @@
+@@ -1189,20 +1761,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -26561,7 +27053,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      echo
  
      cat <<\_ASBOX
-@@ -1211,22 +1794,28 @@
+@@ -1213,22 +1799,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -26597,7 +27089,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
        done | sort
        echo
      fi
-@@ -1238,15 +1827,15 @@
+@@ -1240,15 +1832,15 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -26616,7 +27108,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      exit $exit_status
       ' 0
  for ac_signal in 1 2 13 15; do
-@@ -1255,9 +1844,7 @@
+@@ -1257,9 +1849,7 @@
  ac_signal=0
  
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
@@ -26627,7 +27119,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # Predefined preprocessor variables.
  
-@@ -1288,14 +1875,17 @@
+@@ -1290,14 +1880,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -26651,7 +27143,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1311,8 +1901,8 @@
+@@ -1313,8 +1906,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -26662,7 +27154,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      esac
    fi
  else
-@@ -1324,12 +1914,11 @@
+@@ -1326,12 +1919,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -26678,7 +27170,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1354,8 +1943,7 @@
+@@ -1356,8 +1948,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -26688,7 +27180,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1372,12 +1960,6 @@
+@@ -1374,12 +1965,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -26701,7 +27193,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  
-@@ -1402,6 +1984,11 @@
+@@ -1404,6 +1989,11 @@
  
  
  
@@ -26713,7 +27205,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  
-@@ -1472,106 +2059,164 @@
+@@ -1474,106 +2064,164 @@
  
  
  
@@ -26930,7 +27422,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1595,8 +2240,8 @@
+@@ -1597,8 +2245,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -26941,7 +27433,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1618,7 +2263,7 @@
+@@ -1620,7 +2268,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26950,7 +27442,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -1637,21 +2282,22 @@
+@@ -1639,21 +2287,22 @@
      ;;
  esac
  done
@@ -26978,7 +27470,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -1661,8 +2307,8 @@
+@@ -1663,8 +2312,8 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -26989,7 +27481,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -1704,20 +2350,20 @@
+@@ -1706,20 +2355,20 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -27015,7 +27507,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  # expand $ac_aux_dir to an absolute path
-@@ -1737,8 +2383,8 @@
+@@ -1739,8 +2388,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -27026,7 +27518,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1751,54 +2397,57 @@
+@@ -1753,54 +2402,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27105,7 +27597,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -1872,8 +2521,8 @@
+@@ -1874,8 +2526,8 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -27116,7 +27608,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1886,32 +2535,34 @@
+@@ -1888,32 +2540,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27158,7 +27650,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1924,27 +2575,41 @@
+@@ -1926,27 +2580,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27206,7 +27698,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -1967,8 +2632,8 @@
+@@ -1969,8 +2637,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -27217,7 +27709,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1981,32 +2646,34 @@
+@@ -1983,32 +2651,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27259,7 +27751,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2019,26 +2686,41 @@
+@@ -2021,26 +2691,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27306,7 +27798,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
    CC="$ac_cv_prog_CC"
  fi
-@@ -2047,8 +2729,8 @@
+@@ -2049,8 +2734,8 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -27317,7 +27809,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2061,74 +2743,34 @@
+@@ -2063,74 +2748,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27400,7 +27892,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2142,7 +2784,7 @@
+@@ -2144,7 +2789,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27409,7 +27901,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2153,6 +2795,7 @@
+@@ -2155,6 +2800,7 @@
    fi
  done
  done
@@ -27417,7 +27909,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2170,22 +2813,23 @@
+@@ -2172,22 +2818,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -27448,7 +27940,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2198,36 +2842,38 @@
+@@ -2200,36 +2847,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27495,7 +27987,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2240,30 +2886,46 @@
+@@ -2242,30 +2891,46 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27547,7 +28039,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  
-@@ -2275,21 +2937,35 @@
+@@ -2277,21 +2942,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -27591,7 +28083,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2314,47 +2990,77 @@
+@@ -2316,47 +2995,77 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -27690,7 +28182,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -2366,19 +3072,21 @@
+@@ -2368,19 +3077,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -27719,7 +28211,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2397,22 +3105,27 @@
+@@ -2399,22 +3110,27 @@
      fi
    fi
  fi
@@ -27758,7 +28250,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -2423,9 +3136,8 @@
+@@ -2425,9 +3141,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -27769,7 +28261,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	  break;;
      * ) break;;
    esac
-@@ -2439,14 +3151,14 @@
+@@ -2441,14 +3156,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -27788,7 +28280,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2466,14 +3178,20 @@
+@@ -2468,14 +3183,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -27813,7 +28305,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -2491,12 +3209,12 @@
+@@ -2493,12 +3214,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -27830,7 +28322,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2519,27 +3237,22 @@
+@@ -2521,27 +3242,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27869,7 +28361,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -2547,21 +3260,25 @@
+@@ -2549,21 +3265,25 @@
  
  ac_compiler_gnu=no
  fi
@@ -27901,7 +28393,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -2578,38 +3295,118 @@
+@@ -2580,38 +3300,118 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28036,7 +28528,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2625,12 +3422,12 @@
+@@ -2627,12 +3427,12 @@
      CFLAGS=
    fi
  fi
@@ -28053,7 +28545,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2664,12 +3461,17 @@
+@@ -2666,12 +3466,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -28073,7 +28565,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2684,205 +3486,57 @@
+@@ -2686,205 +3491,57 @@
    return 0;
  }
  _ACEOF
@@ -28244,7 +28736,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -continue
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -28303,13 +28795,13 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2900,8 +3554,8 @@
+@@ -2902,8 +3559,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -28320,7 +28812,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2928,15 +3582,15 @@
+@@ -2930,15 +3587,15 @@
  fi
  
  
@@ -28341,7 +28833,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2956,8 +3610,8 @@
+@@ -2958,8 +3615,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -28352,7 +28844,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3039,8 +3693,8 @@
+@@ -3041,8 +3698,8 @@
  fi
  
  fi
@@ -28363,7 +28855,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3063,8 +3717,8 @@
+@@ -3065,8 +3722,8 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -28374,7 +28866,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -3098,24 +3752,22 @@
+@@ -3100,24 +3757,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -28410,7 +28902,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -3124,9 +3776,10 @@
+@@ -3126,9 +3781,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -28422,7 +28914,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3136,24 +3789,22 @@
+@@ -3138,24 +3794,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -28458,7 +28950,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    # Broken: success on invalid input.
  continue
  else
-@@ -3164,6 +3815,7 @@
+@@ -3166,6 +3820,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -28466,7 +28958,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3181,8 +3833,8 @@
+@@ -3183,8 +3838,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -28477,7 +28969,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3205,24 +3857,22 @@
+@@ -3207,24 +3862,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -28513,7 +29005,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -3231,9 +3881,10 @@
+@@ -3233,9 +3886,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -28525,7 +29017,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3243,24 +3894,22 @@
+@@ -3245,24 +3899,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -28561,7 +29053,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    # Broken: success on invalid input.
  continue
  else
-@@ -3271,6 +3920,7 @@
+@@ -3273,6 +3925,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -28569,7 +29061,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3293,23 +3943,170 @@
+@@ -3295,23 +3948,170 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -28622,7 +29114,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_GREP="$ac_path_GREP"
 +      ac_path_GREP_max=$ac_count
-     fi
++    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
@@ -28638,25 +29130,25 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +IFS=$as_save_IFS
 +
 +
-+fi
+     fi
 +
 +GREP="$ac_cv_path_GREP"
 +if test -z "$GREP"; then
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_GREP=$GREP
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6
 - EGREP=$ac_cv_prog_egrep
  
++else
++  ac_cv_path_GREP=$GREP
++fi
  
 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
@@ -28751,7 +29243,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3333,27 +4130,22 @@
+@@ -3335,27 +4135,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28790,7 +29282,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_cv_header_stdc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -3361,7 +4153,8 @@
+@@ -3363,7 +4158,8 @@
  
  ac_cv_header_stdc=no
  fi
@@ -28800,7 +29292,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -3417,6 +4210,7 @@
+@@ -3419,6 +4215,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -28808,7 +29300,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3436,18 +4230,27 @@
+@@ -3438,18 +4235,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -28842,7 +29334,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3460,12 +4263,14 @@
+@@ -3462,12 +4268,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -28860,7 +29352,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -3488,9 +4293,9 @@
+@@ -3490,9 +4298,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28873,7 +29365,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -3504,27 +4309,22 @@
+@@ -3506,27 +4314,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28912,7 +29404,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    eval "$as_ac_Header=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -3532,10 +4332,12 @@
+@@ -3534,10 +4337,12 @@
  
  eval "$as_ac_Header=no"
  fi
@@ -28928,7 +29420,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -3578,17 +4380,17 @@
+@@ -3580,17 +4385,17 @@
  
  
  
@@ -28954,7 +29446,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_cray_xt3 != xno; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -3597,17 +4399,17 @@
+@@ -3599,17 +4404,17 @@
  
  fi
  
@@ -28980,7 +29472,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_bgl != xno; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -3654,8 +4456,8 @@
+@@ -3656,8 +4461,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -28991,7 +29483,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3668,32 +4470,34 @@
+@@ -3670,32 +4475,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -29033,7 +29525,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3706,37 +4510,51 @@
+@@ -3708,37 +4515,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -29095,7 +29587,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	echo
  	echo "   '$CC_VERSION'"
  	echo "  has been known to generate bad code, "
-@@ -3761,14 +4579,14 @@
+@@ -3763,14 +4584,14 @@
  		bad_cc
  		;;
  	*)
@@ -29114,7 +29606,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_type_unsigned_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3779,39 +4597,35 @@
+@@ -3781,39 +4602,35 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29168,7 +29660,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_cv_type_unsigned_long_long=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -3819,21 +4633,21 @@
+@@ -3821,21 +4638,21 @@
  
  ac_cv_type_unsigned_long_long=no
  fi
@@ -29200,7 +29692,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -3843,10 +4657,11 @@
+@@ -3845,10 +4662,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29213,7 +29705,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  test_array [0] = 0
  
    ;
-@@ -3854,27 +4669,22 @@
+@@ -3856,27 +4674,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29252,7 +29744,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -3884,10 +4694,11 @@
+@@ -3886,10 +4699,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29265,7 +29757,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  test_array [0] = 0
  
    ;
-@@ -3895,27 +4706,22 @@
+@@ -3897,27 +4711,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29304,7 +29796,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_hi=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
-@@ -3928,7 +4734,8 @@
+@@ -3930,7 +4739,8 @@
  		    fi
  		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
@@ -29314,7 +29806,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    done
  else
    echo "$as_me: failed program was:" >&5
-@@ -3941,10 +4748,11 @@
+@@ -3943,10 +4753,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29327,7 +29819,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  test_array [0] = 0
  
    ;
-@@ -3952,27 +4760,22 @@
+@@ -3954,27 +4765,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29366,7 +29858,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -3982,10 +4785,11 @@
+@@ -3984,10 +4790,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29379,7 +29871,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  test_array [0] = 0
  
    ;
-@@ -3993,27 +4797,22 @@
+@@ -3995,27 +4802,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29418,7 +29910,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
-@@ -4026,7 +4825,8 @@
+@@ -4028,7 +4830,8 @@
  		       fi
  		       ac_mid=`expr 2 '*' $ac_mid`
  fi
@@ -29428,7 +29920,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    done
  else
    echo "$as_me: failed program was:" >&5
-@@ -4034,9 +4834,11 @@
+@@ -4036,9 +4839,11 @@
  
  ac_lo= ac_hi=
  fi
@@ -29442,7 +29934,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -4047,10 +4849,11 @@
+@@ -4049,10 +4854,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29455,7 +29947,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  test_array [0] = 0
  
    ;
-@@ -4058,27 +4861,22 @@
+@@ -4060,27 +4866,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29494,7 +29986,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_hi=$ac_mid
  else
    echo "$as_me: failed program was:" >&5
-@@ -4086,23 +4884,21 @@
+@@ -4088,23 +4889,21 @@
  
  ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
@@ -29527,7 +30019,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4111,8 +4907,9 @@
+@@ -4113,8 +4912,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29539,7 +30031,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -4121,35 +4918,44 @@
+@@ -4123,35 +4923,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -29597,7 +30089,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4160,22 +4966,25 @@
+@@ -4162,22 +4971,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -29632,7 +30124,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long
  _ACEOF
-@@ -4196,7 +5005,7 @@
+@@ -4198,7 +5010,7 @@
  	CC="$CC -m64"
  fi
  
@@ -29641,7 +30133,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
  
-@@ -4210,17 +5019,17 @@
+@@ -4212,17 +5024,17 @@
  
  
  
@@ -29667,7 +30159,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_uoss = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -4242,17 +5051,17 @@
+@@ -4244,17 +5056,17 @@
  fi
  
  
@@ -29693,7 +30185,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_uoss = xyes -a x$enable_posix_osd = xyes ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -4273,12 +5082,11 @@
+@@ -4275,12 +5087,11 @@
  
  
  
@@ -29710,7 +30202,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		if test x$enable_doc = xyes ; then
  		    ENABLE_DOC=1
  		else
-@@ -4290,93 +5098,94 @@
+@@ -4292,93 +5103,94 @@
  		ENABLE_DOC=0
  		enable_doc='no'
  
@@ -29718,20 +30210,20 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 -echo "$as_me:$LINENO: result: $enable_doc" >&5
 -echo "${ECHO_T}$enable_doc" >&6
 +fi
- 
++
 +{ echo "$as_me:$LINENO: result: $enable_doc" >&5
 +echo "${ECHO_T}$enable_doc" >&6; }
  
+ 
 -echo "$as_me:$LINENO: checking whether to build utilities" >&5
 -echo $ECHO_N "checking whether to build utilities... $ECHO_C" >&6
 -# Check whether --enable-utils or --disable-utils was given.
--if test "${enable_utils+set}" = set; then
--  enableval="$enable_utils"
- 
 +{ echo "$as_me:$LINENO: checking whether to build utilities" >&5
 +echo $ECHO_N "checking whether to build utilities... $ECHO_C" >&6; }
 +# Check whether --enable-utils was given.
-+if test "${enable_utils+set}" = set; then
+ if test "${enable_utils+set}" = set; then
+-  enableval="$enable_utils"
+-
 +  enableval=$enable_utils;
  else
    enable_utils='yes'
@@ -29854,7 +30346,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_libcfs_cdebug = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -4391,17 +5200,17 @@
+@@ -4393,17 +5205,17 @@
  
  fi
  
@@ -29880,7 +30372,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_libcfs_trace = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -4416,17 +5225,17 @@
+@@ -4418,17 +5230,17 @@
  
  fi
  
@@ -29906,7 +30398,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_libcfs_assert = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -4436,27 +5245,27 @@
+@@ -4438,27 +5250,27 @@
  fi
  
  #check global
@@ -29944,7 +30436,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4467,27 +5276,22 @@
+@@ -4469,27 +5281,22 @@
  #include <sys/quota.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29983,7 +30475,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -4495,13 +5299,14 @@
+@@ -4497,13 +5304,14 @@
  
  ac_header_compiler=no
  fi
@@ -30003,7 +30495,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4510,24 +5315,22 @@
+@@ -4512,24 +5320,22 @@
  /* end confdefs.h.  */
  #include <sys/quota.h>
  _ACEOF
@@ -30039,7 +30531,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -4535,9 +5338,10 @@
+@@ -4537,9 +5343,10 @@
  
    ac_header_preproc=no
  fi
@@ -30052,7 +30544,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4561,25 +5365,23 @@
+@@ -4563,25 +5370,23 @@
  echo "$as_me: WARNING: sys/quota.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: sys/quota.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: sys/quota.h: in the future, the compiler will take precedence" >&2;}
@@ -30084,7 +30576,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  if test $ac_cv_header_sys_quota_h = yes; then
-@@ -4597,12 +5399,11 @@
+@@ -4599,12 +5404,11 @@
  
  
  
@@ -30101,7 +30593,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
  
  		case $target_os in
-@@ -4619,20 +5420,20 @@
+@@ -4621,20 +5425,20 @@
  esac
  
  
@@ -30130,7 +30622,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		if ! [[ $with_linux = /* ]]; then
  			{ { echo "$as_me:$LINENO: error: You must provide an absolute pathname to the --with-linux= option." >&5
  echo "$as_me: error: You must provide an absolute pathname to the --with-linux= option." >&2;}
-@@ -4643,16 +5444,17 @@
+@@ -4645,16 +5449,17 @@
  
  else
    LINUX=/usr/src/linux
@@ -30154,7 +30646,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX"; then
-@@ -4661,8 +5463,9 @@
+@@ -4663,8 +5468,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -30166,7 +30658,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -4673,33 +5476,33 @@
+@@ -4675,33 +5481,33 @@
  
  
  # -------- linux objects (for 2.6) --
@@ -30214,7 +30706,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${lb_cv_file__boot_kernel_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4709,13 +5512,13 @@
+@@ -4711,13 +5517,13 @@
    lb_cv_file__boot_kernel_h=no
  fi
  fi
@@ -30232,7 +30724,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${lb_cv_file__var_adm_running_kernel_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4725,8 +5528,8 @@
+@@ -4727,8 +5533,8 @@
    lb_cv_file__var_adm_running_kernel_h=no
  fi
  fi
@@ -30243,7 +30735,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test $lb_cv_file__var_adm_running_kernel_h = yes; then
    KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h'
  fi
-@@ -4735,17 +5538,17 @@
+@@ -4737,17 +5543,17 @@
  
  
  
@@ -30268,7 +30760,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX_CONFIG"; then
-@@ -4754,8 +5557,9 @@
+@@ -4756,8 +5562,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -30280,7 +30772,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -4770,9 +5574,9 @@
+@@ -4772,9 +5579,9 @@
  # and at more old has only one line
  # include <autoconf.h>
  as_lb_File=`echo "lb_cv_file_$LINUX_OBJ/include/linux/autoconf.h" | $as_tr_sh`
@@ -30293,7 +30785,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX_OBJ/include/linux/autoconf.h"; then
-@@ -4781,8 +5585,9 @@
+@@ -4783,8 +5590,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -30305,7 +30797,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -4792,9 +5597,9 @@
+@@ -4794,9 +5602,9 @@
  fi
  
  as_lb_File=`echo "lb_cv_file_$LINUX_OBJ/include/linux/version.h" | $as_tr_sh`
@@ -30318,7 +30810,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX_OBJ/include/linux/version.h"; then
-@@ -4803,8 +5608,9 @@
+@@ -4805,8 +5613,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -30330,7 +30822,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -4826,9 +5632,9 @@
+@@ -4828,9 +5637,9 @@
  	# enable extensive workarounds to get this to build
  	# modules
  	as_lb_File=`echo "lb_cv_file_$KERNEL_SOURCE_HEADER" | $as_tr_sh`
@@ -30343,7 +30835,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$KERNEL_SOURCE_HEADER"; then
-@@ -4837,8 +5643,9 @@
+@@ -4839,8 +5648,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -30355,7 +30847,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    if test $KERNEL_SOURCE_HEADER = '/boot/kernel.h' ; then
  			{ echo "$as_me:$LINENO: WARNING: Using /boot/kernel.h from RUNNING kernel." >&5
-@@ -4861,30 +5668,30 @@
+@@ -4863,30 +5673,30 @@
  ARCH_UM=
  UML_CFLAGS=
  
@@ -30397,7 +30889,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX/include/linux/namei.h"; then
-@@ -4893,8 +5700,9 @@
+@@ -4895,8 +5705,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -30409,7 +30901,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
  
          	linux25="yes"
-@@ -4907,16 +5715,16 @@
+@@ -4909,16 +5720,16 @@
  
  fi
  
@@ -30432,7 +30924,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	rm -f build/conftest.i
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
-@@ -4947,8 +5755,8 @@
+@@ -4949,8 +5760,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30443,7 +30935,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -4986,8 +5794,8 @@
+@@ -4988,8 +5799,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30454,7 +30946,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -5013,8 +5821,8 @@
+@@ -5015,8 +5826,8 @@
  
  
  # --- check that we can build modules at all
@@ -30465,7 +30957,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5044,16 +5852,16 @@
+@@ -5046,16 +5857,16 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30486,7 +30978,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	{ echo "$as_me:$LINENO: WARNING: Consult config.log for details." >&5
  echo "$as_me: WARNING: Consult config.log for details." >&2;}
  	{ echo "$as_me:$LINENO: WARNING: If you are trying to build with a kernel-source rpm, consult build/README.kernel-source" >&5
-@@ -5067,8 +5875,8 @@
+@@ -5069,8 +5880,8 @@
  
  LINUXRELEASE=
  rm -f build/conftest.i
@@ -30497,7 +30989,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test -s $LINUX_OBJ/include/linux/utsrelease.h ; then
  	LINUXRELEASEHEADER=utsrelease.h
  else
-@@ -5120,8 +5928,8 @@
+@@ -5122,8 +5933,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -30508,7 +31000,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	{ { echo "$as_me:$LINENO: error: Could not preprocess test program.  Consult config.log for details." >&5
  echo "$as_me: error: Could not preprocess test program.  Consult config.log for details." >&2;}
     { (exit 1); exit 1; }; }
-@@ -5130,14 +5938,14 @@
+@@ -5132,14 +5943,14 @@
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  rm -f build/conftest.i
  if test x$LINUXRELEASE = x ; then
@@ -30527,7 +31019,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  moduledir='/lib/modules/'$LINUXRELEASE/kernel
-@@ -5150,16 +5958,16 @@
+@@ -5152,16 +5963,16 @@
  
  
  # ------------ RELEASE --------------------------------
@@ -30550,7 +31042,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5197,22 +6005,22 @@
+@@ -5199,22 +6010,22 @@
  
  		RHEL_KENEL="yes"
  		RHEL_KERNEL="yes"
@@ -30579,7 +31071,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5248,8 +6056,8 @@
+@@ -5250,8 +6061,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30590,7 +31082,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  SUSE_KERNEL="yes"
  
  else
-@@ -5257,8 +6065,8 @@
+@@ -5259,8 +6070,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -30601,7 +31093,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  fi
-@@ -5267,14 +6075,14 @@
+@@ -5269,14 +6080,14 @@
  
  
  
@@ -30620,7 +31112,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
    { { echo "$as_me:$LINENO: error: Could not determine the kernel architecture." >&5
  echo "$as_me: error: Could not determine the kernel architecture." >&2;}
-@@ -5282,21 +6090,21 @@
+@@ -5284,21 +6095,21 @@
  fi
  
            rm -f build/arch
@@ -30648,7 +31140,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5332,8 +6140,8 @@
+@@ -5334,8 +6145,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30659,7 +31151,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  else
-@@ -5341,8 +6149,8 @@
+@@ -5343,8 +6154,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -30670,7 +31162,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  	{ { echo "$as_me:$LINENO: error: module support is required to build Lustre kernel modules." >&5
  echo "$as_me: error: module support is required to build Lustre kernel modules." >&2;}
-@@ -5353,8 +6161,8 @@
+@@ -5355,8 +6166,8 @@
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  
  
@@ -30681,7 +31173,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5390,8 +6198,8 @@
+@@ -5392,8 +6203,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30692,7 +31184,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  else
-@@ -5399,16 +6207,16 @@
+@@ -5401,16 +6212,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -30713,7 +31205,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5444,8 +6252,8 @@
+@@ -5446,8 +6257,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30724,7 +31216,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  else
-@@ -5453,8 +6261,8 @@
+@@ -5455,8 +6266,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -30735,7 +31227,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  if test "x$ARCH_UM" = "x" ; then
  	{ { echo "$as_me:$LINENO: error: Lustre requires that CONFIG_KALLSYMS is enabled in your kernel." >&5
-@@ -5467,8 +6275,8 @@
+@@ -5469,8 +6280,8 @@
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  
  
@@ -30746,7 +31238,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5504,8 +6312,8 @@
+@@ -5506,8 +6317,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30757,7 +31249,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  else
-@@ -5513,8 +6321,8 @@
+@@ -5515,8 +6326,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -30768,7 +31260,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  	{ echo "$as_me:$LINENO: WARNING: " >&5
  echo "$as_me: WARNING: " >&2;}
-@@ -5533,14 +6341,13 @@
+@@ -5535,14 +6346,13 @@
  # it's ugly to be doing anything with OFED outside of the lnet module, but
  # this has to be done here so that the backports path is set before all of
  # the LN_PROG_LINUX checks are done
@@ -30787,7 +31279,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		case $with_o2ib in
  		yes)    O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
  			ENABLEO2IB=2
-@@ -5557,10 +6364,11 @@
+@@ -5559,10 +6369,11 @@
  		O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
  		ENABLEO2IB=1
  
@@ -30802,7 +31294,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
  	o2ib_found=false
  	for O2IBPATH in $O2IBPATHS; do
-@@ -5573,8 +6381,8 @@
+@@ -5575,8 +6386,8 @@
  		fi
  	done
  	if ! $o2ib_found; then
@@ -30813,7 +31305,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		case $ENABLEO2IB in
  			1) ;;
  			2) { { echo "$as_me:$LINENO: error: kernel OpenIB gen2 headers not present" >&5
-@@ -5596,11 +6404,11 @@
+@@ -5598,11 +6409,11 @@
  		if test -n "$BACKPORT_INCLUDES"; then
  			OFED_BACKPORT_PATH=`echo $BACKPORT_INCLUDES | sed "s#.*/src/ofa_kernel/#$O2IBPATH/#"`
  			EXTRA_LNET_INCLUDE="-I$OFED_BACKPORT_PATH $EXTRA_LNET_INCLUDE"
@@ -30829,7 +31321,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
                  fi
  	fi
  fi
-@@ -5608,8 +6416,8 @@
+@@ -5610,8 +6421,8 @@
  
  
  
@@ -30840,7 +31332,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5643,8 +6451,8 @@
+@@ -5645,8 +6456,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30851,7 +31343,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_CPU_ONLINE 1
-@@ -5656,14 +6464,14 @@
+@@ -5658,14 +6469,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -30870,7 +31362,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5697,8 +6505,8 @@
+@@ -5699,8 +6510,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30881,7 +31373,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_GFP_T 1
-@@ -5710,14 +6518,14 @@
+@@ -5712,14 +6523,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -30900,7 +31392,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5751,8 +6559,8 @@
+@@ -5753,8 +6564,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -30911,7 +31403,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_CPUMASK_T 1
-@@ -5764,25 +6572,25 @@
+@@ -5766,25 +6577,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -30947,7 +31439,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
-@@ -5828,33 +6636,33 @@
+@@ -5830,33 +6641,33 @@
  #define CPU_AFFINITY 1
  _ACEOF
  
@@ -30993,7 +31485,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
         BOCD="`grep -c TCP_BACKOFF $LINUX/include/linux/tcp.h`"
         if test "$BOCD" != 0 ; then
-@@ -5863,8 +6671,8 @@
+@@ -5865,8 +6676,8 @@
  #define SOCKNAL_BACKOFF 1
  _ACEOF
  
@@ -31004,7 +31496,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
                 if grep rto_max $LINUX/include/linux/tcp.h|grep -q __u16; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5873,69 +6681,69 @@
+@@ -5875,69 +6686,69 @@
  
                 fi
         else
@@ -31106,7 +31598,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5971,8 +6779,8 @@
+@@ -5973,8 +6784,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31117,7 +31609,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  else
-@@ -5980,11 +6788,11 @@
+@@ -5982,11 +6793,11 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31133,7 +31625,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6020,8 +6828,8 @@
+@@ -6022,8 +6833,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31144,7 +31636,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  else
-@@ -6029,8 +6837,8 @@
+@@ -6031,8 +6842,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31155,7 +31647,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  				{ echo "$as_me:$LINENO: WARNING: QSNET is not enabled in this kernel; not building qswlnd." >&5
  echo "$as_me: WARNING: QSNET is not enabled in this kernel; not building qswlnd." >&2;}
-@@ -6048,8 +6856,8 @@
+@@ -6050,8 +6861,8 @@
  
  	fi
  else
@@ -31166,7 +31658,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	QSWLND=""
  	QSWCPPFLAGS=""
  fi
-@@ -6057,13 +6865,12 @@
+@@ -6059,13 +6870,12 @@
  
  
  
@@ -31184,7 +31676,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	        case $with_gm in
                  no)    ENABLE_GM=0
  	               ;;
-@@ -6076,25 +6883,26 @@
+@@ -6078,25 +6888,26 @@
  
                  ENABLE_GM=0
  
@@ -31220,7 +31712,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  	GMLND="gmlnd"
          GMCPPFLAGS="-I$GM_SRC/include -I$GM_SRC/drivers -I$GM_SRC/drivers/linux/gm"
-@@ -6111,8 +6919,8 @@
+@@ -6113,8 +6924,8 @@
  	EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
  	EXTRA_KCFLAGS="$GMCPPFLAGS -DGM_KERNEL $EXTRA_KCFLAGS"
  
@@ -31231,7 +31723,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6153,16 +6961,16 @@
+@@ -6155,16 +6966,16 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31252,7 +31744,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		{ { echo "$as_me:$LINENO: error: Bad --with-gm path" >&5
  echo "$as_me: error: Bad --with-gm path" >&2;}
     { (exit 1); exit 1; }; }
-@@ -6170,8 +6978,8 @@
+@@ -6172,8 +6983,8 @@
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  
@@ -31263,7 +31755,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6216,15 +7024,15 @@
+@@ -6218,15 +7029,15 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31282,7 +31774,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  Please patch the GM sources as follows...
      cd $GM_SRC
      patch -p0 < $PWD/lnet/klnds/gmlnd/gm-reg-phys.patch
-@@ -6233,7 +7041,7 @@
+@@ -6235,7 +7046,7 @@
  Please patch the GM sources as follows...
      cd $GM_SRC
      patch -p0 < $PWD/lnet/klnds/gmlnd/gm-reg-phys.patch
@@ -31291,7 +31783,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
                  { { echo "$as_me:$LINENO: error: Can't build GM without gm_register_memory_ex_phys()" >&5
  echo "$as_me: error: Can't build GM without gm_register_memory_ex_phys()" >&2;}
     { (exit 1); exit 1; }; }
-@@ -6248,15 +7056,14 @@
+@@ -6250,15 +7061,14 @@
  
  
  
@@ -31311,7 +31803,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		case $with_openib in
  		yes)    ENABLEOPENIB=2
  			;;
-@@ -6271,15 +7078,16 @@
+@@ -6273,15 +7083,16 @@
  
  		ENABLEOPENIB=1
  
@@ -31333,7 +31825,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	case $ENABLEOPENIB in
  	1) ;;
  	2) { { echo "$as_me:$LINENO: error: kernel OpenIB headers not present" >&5
-@@ -6296,8 +7104,8 @@
+@@ -6298,8 +7109,8 @@
  	case $ENABLEOPENIB in
  	1|2) OPENIBCPPFLAGS="-I$OPENIBPATH/include -DIN_TREE_BUILD";;
  	3)   OPENIBCPPFLAGS="-I$OPENIBPATH/include";;
@@ -31344,7 +31836,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	     { { echo "$as_me:$LINENO: error: internal error" >&5
  echo "$as_me: error: internal error" >&2;}
     { (exit 1); exit 1; }; };;
-@@ -6347,8 +7155,8 @@
+@@ -6349,8 +7160,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31355,7 +31847,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		OPENIBLND="openiblnd"
  
  else
-@@ -6356,8 +7164,8 @@
+@@ -6358,8 +7169,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31366,7 +31858,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		case $ENABLEOPENIB in
  		1) ;;
  		2) { { echo "$as_me:$LINENO: error: can't compile with kernel OpenIB headers" >&5
-@@ -6381,26 +7189,25 @@
+@@ -6383,26 +7194,25 @@
  
  
  
@@ -31403,7 +31895,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  				{ { echo "$as_me:$LINENO: error: No directory $CIBPATH" >&5
  echo "$as_me: error: No directory $CIBPATH" >&2;}
     { (exit 1); exit 1; }; }
-@@ -6409,10 +7216,11 @@
+@@ -6411,10 +7221,11 @@
  
  else
  
@@ -31418,7 +31910,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test -n "$CIBPATH"; then
  	CIBCPPFLAGS="-I${CIBPATH}/ib/ts_api_ng/include -I${CIBPATH}/all/kernel_services/include -DUSING_TSAPI"
  	CIBCPPFLAGS="$CIBCPPFLAGS -DIB_NTXRXPARAMS=3"
-@@ -6479,24 +7287,23 @@
+@@ -6481,24 +7292,23 @@
  
  
  
@@ -31453,7 +31945,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  				{ { echo "$as_me:$LINENO: error: No directory $VIBPATH" >&5
  echo "$as_me: error: No directory $VIBPATH" >&2;}
     { (exit 1); exit 1; }; }
-@@ -6505,10 +7312,11 @@
+@@ -6507,10 +7317,11 @@
  
  else
  
@@ -31468,7 +31960,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test -z "$VIBPATH"; then
  	VIBLND=""
  else
-@@ -6590,8 +7398,8 @@
+@@ -6592,8 +7403,8 @@
  if test -n "$VIBLND"; then
  	EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
  	EXTRA_KCFLAGS="$EXTRA_KCFLAGS $VIBCPPFLAGS"
@@ -31479,7 +31971,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6639,8 +7447,8 @@
+@@ -6641,8 +7452,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31490,7 +31982,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	        VIBCPPFLAGS="$VIBCPPFLAGS -DIBNAL_VOIDSTAR_SGADDR=1"
  
  else
-@@ -6648,8 +7456,8 @@
+@@ -6650,8 +7461,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31501,7 +31993,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -6659,15 +7467,14 @@
+@@ -6661,15 +7472,14 @@
  
  
  
@@ -31521,7 +32013,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		case $with_iib in
  		yes)    ENABLEIIB=2
  			;;
-@@ -6682,13 +7489,14 @@
+@@ -6684,13 +7494,14 @@
  
  		ENABLEIIB=1
  
@@ -31541,7 +32033,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	case $ENABLEIIB in
  	1) ;;
  	2) { { echo "$as_me:$LINENO: error: default Infinicon headers not present" >&5
-@@ -6748,8 +7556,8 @@
+@@ -6750,8 +7561,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31552,7 +32044,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		IIBLND="iiblnd"
  
  else
-@@ -6757,8 +7565,8 @@
+@@ -6759,8 +7570,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31563,7 +32055,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		case $ENABLEIIB in
  		1) ;;
  		2) { { echo "$as_me:$LINENO: error: can't compile with default Infinicon headers" >&5
-@@ -6782,14 +7590,13 @@
+@@ -6784,14 +7595,13 @@
  
  
  
@@ -31582,7 +32074,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		case $with_o2ib in
  		yes)    O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
  			ENABLEO2IB=2
-@@ -6806,10 +7613,11 @@
+@@ -6808,10 +7618,11 @@
  		O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
  		ENABLEO2IB=1
  
@@ -31597,7 +32089,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
  	o2ib_found=false
  
-@@ -6824,8 +7632,8 @@
+@@ -6826,8 +7637,8 @@
  	done
  
  	if ! $o2ib_found; then
@@ -31608,7 +32100,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		case $ENABLEO2IB in
  			1) ;;
  			2) { { echo "$as_me:$LINENO: error: kernel OpenIB gen2 headers not present" >&5
-@@ -6893,8 +7701,8 @@
+@@ -6895,8 +7706,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31619,7 +32111,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		        O2IBLND="o2iblnd"
  
  else
-@@ -6902,8 +7710,8 @@
+@@ -6904,8 +7715,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31630,7 +32122,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		        case $ENABLEO2IB in
  		        1) ;;
  		        2) { { echo "$as_me:$LINENO: error: can't compile with kernel OpenIB gen2 headers" >&5
-@@ -6950,8 +7758,8 @@
+@@ -6952,8 +7763,8 @@
  		fi
  
  
@@ -31641,7 +32133,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6991,8 +7799,8 @@
+@@ -6993,8 +7804,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31652,7 +32144,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_OFED_IB_DMA_MAP 1
-@@ -7004,14 +7812,14 @@
+@@ -7006,14 +7817,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31671,7 +32163,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7051,8 +7859,8 @@
+@@ -7053,8 +7864,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31682,7 +32174,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_OFED_IB_COMP_VECTOR 1
-@@ -7064,14 +7872,14 @@
+@@ -7066,14 +7877,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31701,7 +32193,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7111,8 +7919,8 @@
+@@ -7113,8 +7924,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31712,7 +32204,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_OFED_TRANSPORT_IWARP 1
-@@ -7124,14 +7932,14 @@
+@@ -7126,14 +7937,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31731,7 +32223,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7170,8 +7978,8 @@
+@@ -7172,8 +7983,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31742,7 +32234,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_OFED_RDMA_CMEV_ADDRCHANGE 1
-@@ -7183,14 +7991,14 @@
+@@ -7185,14 +7996,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31761,7 +32253,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7229,8 +8037,8 @@
+@@ -7231,8 +8042,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31772,7 +32264,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_OFED_RDMA_CMEV_TIMEWAIT_EXIT 1
-@@ -7242,8 +8050,8 @@
+@@ -7244,8 +8055,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31783,7 +32275,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -7257,8 +8065,8 @@
+@@ -7259,8 +8070,8 @@
  
  
  #### Rapid Array
@@ -31794,7 +32286,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  # placeholder
  RACPPFLAGS="-I${LINUX}/drivers/xd1/include"
  EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
-@@ -7302,8 +8110,8 @@
+@@ -7304,8 +8115,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31805,7 +32297,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	RALND="ralnd"
  
  else
-@@ -7311,8 +8119,8 @@
+@@ -7313,8 +8124,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31816,7 +32308,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	RALND=""
  	RACPPFLAGS=""
  
-@@ -7324,13 +8132,12 @@
+@@ -7326,13 +8137,12 @@
  
  
  if test -z "$ENABLEPORTALS"; then
@@ -31834,7 +32326,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		case $with_portals in
  			no)     ENABLEPORTALS=0
  				;;
-@@ -7343,49 +8150,49 @@
+@@ -7345,49 +8155,49 @@
  
  		ENABLEPORTALS=0
  
@@ -31902,7 +32394,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
                 case $with_mx in
                 yes)    ENABLEMX=2
                         ;;
-@@ -7400,15 +8207,16 @@
+@@ -7402,15 +8212,16 @@
  
                 ENABLEMX=1
  
@@ -31924,7 +32416,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
         case $ENABLEMX in
         1) ;;
         2) { { echo "$as_me:$LINENO: error: Myrinet MX kernel headers not present" >&5
-@@ -7471,8 +8279,8 @@
+@@ -7473,8 +8284,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31935,7 +32427,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
                 MXLND="mxlnd"
  
  else
-@@ -7480,8 +8288,8 @@
+@@ -7482,8 +8293,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31946,7 +32438,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
                 case $ENABLEMX in
                 1) ;;
                 2) { { echo "$as_me:$LINENO: error: can't compile with Myrinet MX kernel headers" >&5
-@@ -7506,8 +8314,8 @@
+@@ -7508,8 +8319,8 @@
  
  
  
@@ -31957,7 +32449,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7542,8 +8350,8 @@
+@@ -7544,8 +8355,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -31968,7 +32460,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_PAGE_LIST 1
-@@ -7555,14 +8363,14 @@
+@@ -7557,14 +8368,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -31987,7 +32479,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7602,22 +8410,22 @@
+@@ -7604,22 +8415,22 @@
  #define CONFIG_RH_2_4_20 1
  _ACEOF
  
@@ -32016,7 +32508,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]show_task[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -7631,13 +8439,13 @@
+@@ -7633,13 +8444,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -32034,7 +32526,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7647,8 +8455,8 @@
+@@ -7649,8 +8460,8 @@
  
      fi
  else
@@ -32045,7 +32537,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7659,8 +8467,8 @@
+@@ -7661,8 +8472,8 @@
  fi
  
  
@@ -32056,7 +32548,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  tmp_flags="$EXTRA_KCFLAGS"
  EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror"
  cat >conftest.c <<_ACEOF
-@@ -7700,8 +8508,8 @@
+@@ -7702,8 +8513,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32067,7 +32559,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_KERN__U64_LONG_LONG 1
-@@ -7713,15 +8521,15 @@
+@@ -7715,15 +8526,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32087,7 +32579,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  tmp_flags="$CFLAGS"
  CFLAGS="$CFLAGS -Werror"
  cat >conftest.$ac_ext <<_ACEOF
-@@ -7738,30 +8546,25 @@
+@@ -7740,30 +8551,25 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32131,7 +32623,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SSIZE_T_LONG 1
-@@ -7773,15 +8576,16 @@
+@@ -7775,15 +8581,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32153,7 +32645,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  tmp_flags="$CFLAGS"
  CFLAGS="$CFLAGS -Werror"
  cat >conftest.$ac_ext <<_ACEOF
-@@ -7798,30 +8602,25 @@
+@@ -7800,30 +8607,25 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32197,7 +32689,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SIZE_T_LONG 1
-@@ -7833,15 +8632,16 @@
+@@ -7835,15 +8637,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32219,7 +32711,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7876,8 +8676,8 @@
+@@ -7878,8 +8681,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32230,7 +32722,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LE_TYPES 1
-@@ -7889,14 +8689,14 @@
+@@ -7891,14 +8694,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32249,7 +32741,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7932,8 +8732,8 @@
+@@ -7934,8 +8737,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32260,7 +32752,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_TASK_RCU 1
-@@ -7945,15 +8745,15 @@
+@@ -7947,15 +8750,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32280,7 +32772,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]tasklist_lock[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -7967,13 +8767,13 @@
+@@ -7969,13 +8772,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -32298,7 +32790,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7983,8 +8783,8 @@
+@@ -7985,8 +8788,8 @@
  
      fi
  else
@@ -32309,7 +32801,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7996,8 +8796,8 @@
+@@ -7998,8 +8801,8 @@
  
  
  # 2.6.19
@@ -32320,7 +32812,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8031,8 +8831,8 @@
+@@ -8033,8 +8836,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32331,7 +32823,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_KMEM_CACHE_DESTROY_INT 1
-@@ -8044,14 +8844,14 @@
+@@ -8046,14 +8849,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32350,7 +32842,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8086,8 +8886,8 @@
+@@ -8088,8 +8891,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32361,7 +32853,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_ATOMIC_PANIC_NOTIFIER 1
-@@ -8099,15 +8899,15 @@
+@@ -8101,15 +8904,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32381,7 +32873,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8143,8 +8943,8 @@
+@@ -8145,8 +8948,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32392,7 +32884,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_3ARGS_INIT_WORK 1
-@@ -8156,15 +8956,15 @@
+@@ -8158,15 +8961,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32412,7 +32904,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8198,8 +8998,8 @@
+@@ -8200,8 +9003,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32423,7 +32915,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_2ARGS_REGISTER_SYSCTL 1
-@@ -8211,14 +9011,14 @@
+@@ -8213,14 +9016,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32442,7 +32934,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  tmp_flags="$EXTRA_KCFLAGS"
  EXTRA_KCFLAGS="-Werror"
  cat >conftest.c <<_ACEOF
-@@ -8257,8 +9057,8 @@
+@@ -8259,8 +9062,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32453,7 +32945,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_KMEM_CACHE 1
-@@ -8270,16 +9070,16 @@
+@@ -8272,16 +9075,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32474,7 +32966,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8313,8 +9113,8 @@
+@@ -8315,8 +9118,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32485,7 +32977,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_KMEM_CACHE_CREATE_DTOR 1
-@@ -8326,15 +9126,15 @@
+@@ -8328,15 +9131,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32505,7 +32997,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8370,8 +9170,8 @@
+@@ -8372,8 +9175,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32516,7 +33008,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SYSCTL_UNNUMBERED 1
-@@ -8383,14 +9183,14 @@
+@@ -8385,14 +9188,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32535,7 +33027,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8424,8 +9224,8 @@
+@@ -8427,8 +9230,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32546,7 +33038,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SCATTERLIST_SETPAGE 1
-@@ -8437,15 +9237,15 @@
+@@ -8440,15 +9243,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32566,7 +33058,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8481,8 +9281,8 @@
+@@ -8484,8 +9287,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32577,7 +33069,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SEM_COUNT_ATOMIC 1
-@@ -8494,15 +9294,15 @@
+@@ -8497,15 +9300,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32597,7 +33089,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8536,8 +9336,8 @@
+@@ -8539,8 +9342,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32608,7 +33100,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SOCK_MAP_FD_2ARG 1
-@@ -8549,14 +9349,14 @@
+@@ -8552,14 +9355,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32627,7 +33119,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]dump_trace[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -8570,17 +9370,17 @@
+@@ -8573,17 +9376,17 @@
  	fi
      done
      if test $export -eq 0; then
@@ -32644,14 +33136,14 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  	tmp_flags="$EXTRA_KCFLAGS"
  	EXTRA_KCFLAGS="-Werror"
--	echo "$as_me:$LINENO: checking whether we can really use dump_stack" >&5
--echo $ECHO_N "checking whether we can really use dump_stack... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: checking whether we can really use dump_stack" >&5
-+echo $ECHO_N "checking whether we can really use dump_stack... $ECHO_C" >&6; }
+-	echo "$as_me:$LINENO: checking whether we can really use dump_trace" >&5
+-echo $ECHO_N "checking whether we can really use dump_trace... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking whether we can really use dump_trace" >&5
++echo $ECHO_N "checking whether we can really use dump_trace... $ECHO_C" >&6; }
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8615,8 +9415,8 @@
+@@ -8618,8 +9421,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32662,7 +33154,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_DUMP_TRACE 1
-@@ -8628,13 +9428,13 @@
+@@ -8631,13 +9434,13 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32680,7 +33172,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8673,8 +9473,8 @@
+@@ -8676,8 +9479,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32691,7 +33183,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_TRACE_ADDRESS_RELIABLE 1
-@@ -8686,8 +9486,8 @@
+@@ -8689,8 +9492,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32702,7 +33194,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -8695,13 +9495,13 @@
+@@ -8698,13 +9501,13 @@
  
      fi
  else
@@ -32713,14 +33205,14 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  	tmp_flags="$EXTRA_KCFLAGS"
  	EXTRA_KCFLAGS="-Werror"
--	echo "$as_me:$LINENO: checking whether we can really use dump_stack" >&5
--echo $ECHO_N "checking whether we can really use dump_stack... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: checking whether we can really use dump_stack" >&5
-+echo $ECHO_N "checking whether we can really use dump_stack... $ECHO_C" >&6; }
+-	echo "$as_me:$LINENO: checking whether we can really use dump_trace" >&5
+-echo $ECHO_N "checking whether we can really use dump_trace... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking whether we can really use dump_trace" >&5
++echo $ECHO_N "checking whether we can really use dump_trace... $ECHO_C" >&6; }
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8736,8 +9536,8 @@
+@@ -8739,8 +9542,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32731,7 +33223,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_DUMP_TRACE 1
-@@ -8749,13 +9549,13 @@
+@@ -8752,13 +9555,13 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32749,7 +33241,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8794,8 +9594,8 @@
+@@ -8797,8 +9600,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32760,7 +33252,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_TRACE_ADDRESS_RELIABLE 1
-@@ -8807,8 +9607,8 @@
+@@ -8810,8 +9613,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -32771,20 +33263,20 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -8819,9 +9619,9 @@
+@@ -8821,9 +9624,9 @@
  
  
- 			as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/lustre_version.h" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $LINUX/include/linux/lustre_version.h" >&5
--echo $ECHO_N "checking for $LINUX/include/linux/lustre_version.h... $ECHO_C" >&6
+ as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/cred.h" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $LINUX/include/linux/cred.h" >&5
+-echo $ECHO_N "checking for $LINUX/include/linux/cred.h... $ECHO_C" >&6
 -if eval "test \"\${$as_lb_File+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $LINUX/include/linux/lustre_version.h" >&5
-+echo $ECHO_N "checking for $LINUX/include/linux/lustre_version.h... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for $LINUX/include/linux/cred.h" >&5
++echo $ECHO_N "checking for $LINUX/include/linux/cred.h... $ECHO_C" >&6; }
 +if { as_var=$as_lb_File; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   if test -r "$LINUX/include/linux/lustre_version.h"; then
-@@ -8830,8 +9630,9 @@
+   if test -r "$LINUX/include/linux/cred.h"; then
+@@ -8832,8 +9635,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -32795,101 +33287,128 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_lb_File'}'` = yes; then
  
- 	rm -f "$LUSTRE/include/linux/lustre_version.h"
-@@ -8882,8 +9683,8 @@
- 	fi
  
- 	# --- Check that ext3 and ext3 xattr are enabled in the kernel
--	echo "$as_me:$LINENO: checking if Linux was built with CONFIG_EXT3_FS" >&5
--echo $ECHO_N "checking if Linux was built with CONFIG_EXT3_FS... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: checking if Linux was built with CONFIG_EXT3_FS" >&5
-+echo $ECHO_N "checking if Linux was built with CONFIG_EXT3_FS... $ECHO_C" >&6; }
+@@ -8844,15 +9648,15 @@
+ 
+ else
+ 
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+ 
+ #2.6.29
+-echo "$as_me:$LINENO: checking if kernel has struct cred" >&5
+-echo $ECHO_N "checking if kernel has struct cred... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if kernel has struct cred" >&5
++echo $ECHO_N "checking if kernel has struct cred... $ECHO_C" >&6; }
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8919,8 +9720,8 @@
+@@ -8887,8 +9691,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
--echo "$as_me:$LINENO: result: yes" >&5
+-	echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
++	{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  
- 
- else
-@@ -8928,11 +9729,11 @@
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_STRUCT_CRED 1
+@@ -8900,15 +9704,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
--echo "$as_me:$LINENO: result: no" >&5
+-	echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+{ echo "$as_me:$LINENO: result: no" >&5
++	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  
--	echo "$as_me:$LINENO: checking if Linux was built with CONFIG_EXT3_FS_MODULE" >&5
--echo $ECHO_N "checking if Linux was built with CONFIG_EXT3_FS_MODULE... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: checking if Linux was built with CONFIG_EXT3_FS_MODULE" >&5
-+echo $ECHO_N "checking if Linux was built with CONFIG_EXT3_FS_MODULE... $ECHO_C" >&6; }
+ fi
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ 
+ # 2.6.30
+-echo "$as_me:$LINENO: checking if kernel defines unshare_fs_struct()" >&5
+-echo $ECHO_N "checking if kernel defines unshare_fs_struct()... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if kernel defines unshare_fs_struct()" >&5
++echo $ECHO_N "checking if kernel defines unshare_fs_struct()... $ECHO_C" >&6; }
+ tmp_flags="$EXTRA_KCFLAGS"
+ EXTRA_KCFLAGS="-Werror"
  cat >conftest.c <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8968,8 +9769,8 @@
+@@ -8945,8 +9749,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
--echo "$as_me:$LINENO: result: yes" >&5
+-	echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
++	{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  
- 
- else
-@@ -8977,8 +9778,8 @@
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_UNSHARE_FS_STRUCT 1
+@@ -8958,8 +9762,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
--echo "$as_me:$LINENO: result: no" >&5
+-	echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+{ echo "$as_me:$LINENO: result: no" >&5
++	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  
- 		{ { echo "$as_me:$LINENO: error: Lustre requires that ext3 is enabled in the kernel" >&5
- echo "$as_me: error: Lustre requires that ext3 is enabled in the kernel" >&2;}
-@@ -8993,8 +9794,8 @@
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+@@ -8967,9 +9771,9 @@
+ 
  
--echo "$as_me:$LINENO: checking if Linux was built with CONFIG_EXT3_FS_XATTR" >&5
--echo $ECHO_N "checking if Linux was built with CONFIG_EXT3_FS_XATTR... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if Linux was built with CONFIG_EXT3_FS_XATTR" >&5
-+echo $ECHO_N "checking if Linux was built with CONFIG_EXT3_FS_XATTR... $ECHO_C" >&6; }
+ 			as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/lustre_version.h" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $LINUX/include/linux/lustre_version.h" >&5
+-echo $ECHO_N "checking for $LINUX/include/linux/lustre_version.h... $ECHO_C" >&6
+-if eval "test \"\${$as_lb_File+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $LINUX/include/linux/lustre_version.h" >&5
++echo $ECHO_N "checking for $LINUX/include/linux/lustre_version.h... $ECHO_C" >&6; }
++if { as_var=$as_lb_File; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -r "$LINUX/include/linux/lustre_version.h"; then
+@@ -8978,8 +9782,9 @@
+   eval "$as_lb_File=no"
+ fi
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_lb_File'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_lb_File'}'`" >&6
++ac_res=`eval echo '${'$as_lb_File'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_lb_File'}'` = yes; then
+ 
+ 	rm -f "$LUSTRE/include/linux/lustre_version.h"
+@@ -9017,8 +9822,8 @@
+ 	fi
+ 
+           if test x$enable_server = xyes ; then
+-              echo "$as_me:$LINENO: checking if kernel has new dev_set_rdonly" >&5
+-echo $ECHO_N "checking if kernel has new dev_set_rdonly... $ECHO_C" >&6
++              { echo "$as_me:$LINENO: checking if kernel has new dev_set_rdonly" >&5
++echo $ECHO_N "checking if kernel has new dev_set_rdonly... $ECHO_C" >&6; }
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9030,8 +9831,8 @@
+@@ -9055,8 +9860,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
--echo "$as_me:$LINENO: result: yes" >&5
+-        echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
++        { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  
- 
- else
-@@ -9039,8 +9840,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
- 		{ echo "$as_me:$LINENO: WARNING: Lustre requires that extended attributes for ext3 are enabled in the kernel" >&5
- echo "$as_me: WARNING: Lustre requires that extended attributes for ext3 are enabled in the kernel" >&2;}
-@@ -9099,14 +9900,14 @@
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_DEV_SET_RDONLY 1
+@@ -9127,14 +9932,14 @@
  
  fi #ldiskfs
  
@@ -32910,7 +33429,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9142,8 +9943,8 @@
+@@ -9170,8 +9975,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -32921,7 +33440,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -9158,17 +9959,17 @@
+@@ -9186,17 +9991,17 @@
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  
            fi
@@ -32947,7 +33466,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_pinger != xno ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9177,17 +9978,17 @@
+@@ -9205,17 +10010,17 @@
  
  fi
  
@@ -32973,7 +33492,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_checksum != xno ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9196,17 +9997,17 @@
+@@ -9224,17 +10029,17 @@
  
  fi
  
@@ -32999,7 +33518,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_liblustre_recovery != xno ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9215,17 +10016,17 @@
+@@ -9243,17 +10048,17 @@
  
  fi
  
@@ -33025,7 +33544,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_health_write == xyes ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9234,17 +10035,17 @@
+@@ -9262,17 +10067,17 @@
  
  fi
  
@@ -33051,7 +33570,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_lru_resize != xno; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9253,17 +10054,17 @@
+@@ -9281,17 +10086,17 @@
  
  fi
  
@@ -33077,7 +33596,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_adaptive_timeouts == xyes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9272,17 +10073,17 @@
+@@ -9300,17 +10105,17 @@
  
  fi
  
@@ -33103,7 +33622,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_delayed_recovery == xyes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9292,8 +10093,8 @@
+@@ -9320,8 +10125,8 @@
  fi
  
            if test x$enable_quota != xno; then
@@ -33114,7 +33633,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9329,8 +10130,8 @@
+@@ -9357,8 +10162,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -33125,7 +33644,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  	enable_quota_module='yes'
  
-@@ -9345,8 +10146,8 @@
+@@ -9373,8 +10178,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -33136,40 +33655,9 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  	enable_quota_module='no'
  	{ echo "$as_me:$LINENO: WARNING: quota is not enabled because the kernel - lacks quota support" >&5
-@@ -9359,8 +10160,8 @@
- fi
+@@ -9388,8 +10193,8 @@
  
  
--          echo "$as_me:$LINENO: checking task p_pptr found" >&5
--echo $ECHO_N "checking task p_pptr found... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: checking task p_pptr found" >&5
-+echo $ECHO_N "checking task p_pptr found... $ECHO_C" >&6; }
- cat >conftest.c <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9396,8 +10197,8 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--	echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_TASK_PPTR 1
-@@ -9409,15 +10210,15 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
- fi
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
- 
            # RHEL4 patches
 -          echo "$as_me:$LINENO: checking if Linux was built with symbol truncate_complete_page exported" >&5
 -echo $ECHO_N "checking if Linux was built with symbol truncate_complete_page exported... $ECHO_C" >&6
@@ -33178,7 +33666,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]truncate_complete_page[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -9431,13 +10232,13 @@
+@@ -9403,13 +10208,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -33196,7 +33684,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9447,8 +10248,8 @@
+@@ -9419,8 +10224,8 @@
  
      fi
  else
@@ -33207,7 +33695,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9459,8 +10260,8 @@
+@@ -9431,8 +10236,8 @@
  fi
  
  
@@ -33218,7 +33706,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]truncate_inode_pages_range[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -9474,13 +10275,13 @@
+@@ -9446,13 +10251,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -33236,7 +33724,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9490,8 +10291,8 @@
+@@ -9462,8 +10267,8 @@
  
      fi
  else
@@ -33247,7 +33735,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9502,8 +10303,8 @@
+@@ -9474,8 +10279,8 @@
  fi
  
  
@@ -33258,7 +33746,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]d_rehash_cond[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -9517,13 +10318,13 @@
+@@ -9489,13 +10294,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -33276,7 +33764,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9533,8 +10334,8 @@
+@@ -9505,8 +10310,8 @@
  
      fi
  else
@@ -33287,7 +33775,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9545,8 +10346,8 @@
+@@ -9517,8 +10322,8 @@
  fi
  
  
@@ -33298,7 +33786,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]__d_rehash[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -9560,13 +10361,13 @@
+@@ -9532,13 +10337,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -33316,7 +33804,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9576,8 +10377,8 @@
+@@ -9548,8 +10353,8 @@
  
      fi
  else
@@ -33327,7 +33815,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9588,8 +10389,8 @@
+@@ -9560,8 +10365,8 @@
  fi
  
  
@@ -33338,7 +33826,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]d_move_locked[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -9603,13 +10404,13 @@
+@@ -9575,13 +10380,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -33356,7 +33844,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9619,8 +10420,8 @@
+@@ -9591,8 +10396,8 @@
  
      fi
  else
@@ -33367,7 +33855,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9631,8 +10432,8 @@
+@@ -9603,8 +10408,8 @@
  fi
  
  
@@ -33378,7 +33866,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]__d_move[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -9646,13 +10447,13 @@
+@@ -9618,13 +10423,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -33396,7 +33884,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9662,8 +10463,8 @@
+@@ -9634,8 +10439,8 @@
  
      fi
  else
@@ -33407,7 +33895,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9674,8 +10475,8 @@
+@@ -9646,8 +10451,8 @@
  fi
  
  
@@ -33418,7 +33906,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]node_to_cpumask[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -9689,12 +10490,12 @@
+@@ -9661,12 +10466,12 @@
  	fi
      done
      if test $export -eq 0; then
@@ -33435,7 +33923,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NODE_TO_CPUMASK 1
-@@ -9702,8 +10503,8 @@
+@@ -9674,8 +10479,8 @@
  
      fi
  else
@@ -33446,7 +33934,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NODE_TO_CPUMASK 1
-@@ -9711,8 +10512,8 @@
+@@ -9683,8 +10488,8 @@
  
  fi
   # x86_64
@@ -33457,7 +33945,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]node_to_cpu_mask[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -9726,12 +10527,12 @@
+@@ -9698,12 +10503,12 @@
  	fi
      done
      if test $export -eq 0; then
@@ -33474,7 +33962,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NODE_TO_CPUMASK 1
-@@ -9739,8 +10540,8 @@
+@@ -9711,8 +10516,8 @@
  
      fi
  else
@@ -33485,7 +33973,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NODE_TO_CPUMASK 1
-@@ -9748,8 +10549,8 @@
+@@ -9720,8 +10525,8 @@
  
  fi
   # ia64
@@ -33496,7 +33984,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]node_2_cpu_mask[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -9763,12 +10564,12 @@
+@@ -9735,12 +10540,12 @@
  	fi
      done
      if test $export -eq 0; then
@@ -33513,7 +34001,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NODE_TO_CPUMASK 1
-@@ -9776,8 +10577,8 @@
+@@ -9748,8 +10553,8 @@
  
      fi
  else
@@ -33524,7 +34012,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NODE_TO_CPUMASK 1
-@@ -9787,8 +10588,8 @@
+@@ -9759,8 +10564,8 @@
   # i386
  
  
@@ -33532,10 +34020,10 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 -echo $ECHO_N "checking if releasepage has a gfp_t parameter... $ECHO_C" >&6
 +          { echo "$as_me:$LINENO: checking if releasepage has a gfp_t parameter" >&5
 +echo $ECHO_N "checking if releasepage has a gfp_t parameter... $ECHO_C" >&6; }
- RELEASEPAGE_WITH_GFP="`grep -c 'releasepage.*gfp_t' $LINUX/include/linux/fs.h`"
+ RELEASEPAGE_WITH_GFP="$(grep -c 'releasepage.*gfp_t' $LINUX/include/linux/fs.h)"
  if test "$RELEASEPAGE_WITH_GFP" != 0 ; then
  
-@@ -9796,15 +10597,15 @@
+@@ -9768,15 +10573,15 @@
  #define HAVE_RELEASEPAGE_WITH_GFP 1
  _ACEOF
  
@@ -33550,14 +34038,14 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +echo "${ECHO_T}no" >&6; }
  fi
  
--          echo "$as_me:$LINENO: checking if kernel has mm_inline.h header" >&5
--echo $ECHO_N "checking if kernel has mm_inline.h header... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: checking if kernel has mm_inline.h header" >&5
-+echo $ECHO_N "checking if kernel has mm_inline.h header... $ECHO_C" >&6; }
+-          echo "$as_me:$LINENO: checking if ldiskfs has xattr.h header" >&5
+-echo $ECHO_N "checking if ldiskfs has xattr.h header... $ECHO_C" >&6
++          { echo "$as_me:$LINENO: checking if ldiskfs has xattr.h header" >&5
++echo $ECHO_N "checking if ldiskfs has xattr.h header... $ECHO_C" >&6; }
+ tmp_flags="$EXTRA_KCFLAGS"
+ EXTRA_KCFLAGS="-I$LINUX/fs -I$LDISKFS_DIR -I$LDISKFS_DIR/ldiskfs"
  cat >conftest.c <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9840,8 +10641,8 @@
+@@ -9814,8 +10619,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -33567,8 +34055,8 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +echo "${ECHO_T}yes" >&6; }
  
  cat >>confdefs.h <<\_ACEOF
- #define HAVE_MM_INLINE 1
-@@ -9853,14 +10654,14 @@
+ #define HAVE_LDISKFS_XATTR_H 1
+@@ -9827,15 +10632,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -33579,194 +34067,84 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ EXTRA_KCFLAGS="$tmp_flags"
  
--          echo "$as_me:$LINENO: checking if struct inode has i_alloc_sem" >&5
--echo $ECHO_N "checking if struct inode has i_alloc_sem... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: checking if struct inode has i_alloc_sem" >&5
-+echo $ECHO_N "checking if struct inode has i_alloc_sem... $ECHO_C" >&6; }
- cat >conftest.c <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9896,8 +10697,8 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--	echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_I_ALLOC_SEM 1
-@@ -9909,14 +10710,14 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--	echo "$as_me:$LINENO: result: no" >&5
+-          echo "$as_me:$LINENO: checking if Linux was built with symbol grab_cache_page_nowait_gfp exported" >&5
+-echo $ECHO_N "checking if Linux was built with symbol grab_cache_page_nowait_gfp exported... $ECHO_C" >&6
++          { echo "$as_me:$LINENO: checking if Linux was built with symbol grab_cache_page_nowait_gfp exported" >&5
++echo $ECHO_N "checking if Linux was built with symbol grab_cache_page_nowait_gfp exported... $ECHO_C" >&6; }
+ grep -q -E '[[:space:]]grab_cache_page_nowait_gfp[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
+ rc=$?
+ if test $rc -ne 0; then
+@@ -9849,10 +10654,10 @@
+ 	fi
+     done
+     if test $export -eq 0; then
+-    	echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
+-    	echo "$as_me:$LINENO: checking if Linux was built with symbol add_to_page_cache_lru exported" >&5
+-echo $ECHO_N "checking if Linux was built with symbol add_to_page_cache_lru exported... $ECHO_C" >&6
++    	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++    	{ echo "$as_me:$LINENO: checking if Linux was built with symbol add_to_page_cache_lru exported" >&5
++echo $ECHO_N "checking if Linux was built with symbol add_to_page_cache_lru exported... $ECHO_C" >&6; }
+ grep -q -E '[[:space:]]add_to_page_cache_lru[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
+ rc=$?
+ if test $rc -ne 0; then
+@@ -9866,13 +10671,13 @@
+ 	fi
+     done
+     if test $export -eq 0; then
+-    	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  
- fi
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
- 
--          echo "$as_me:$LINENO: checking if kernel defines cache pressure hook" >&5
--echo $ECHO_N "checking if kernel defines cache pressure hook... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: checking if kernel defines cache pressure hook" >&5
-+echo $ECHO_N "checking if kernel defines cache pressure hook... $ECHO_C" >&6; }
- cat >conftest.c <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9952,8 +10753,8 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--	echo "$as_me:$LINENO: result: set_shrinker" >&5
--echo "${ECHO_T}set_shrinker" >&6
-+	{ echo "$as_me:$LINENO: result: set_shrinker" >&5
-+echo "${ECHO_T}set_shrinker" >&6; }
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SHRINKER_CACHE 1
-@@ -10004,15 +10805,15 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+     else
+-    	echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
  
--		echo "$as_me:$LINENO: result: register_cache" >&5
--echo "${ECHO_T}register_cache" >&6
-+		{ echo "$as_me:$LINENO: result: register_cache" >&5
-+echo "${ECHO_T}register_cache" >&6; }
  
  cat >>confdefs.h <<\_ACEOF
- #define HAVE_REGISTER_CACHE 1
- _ACEOF
- 
--		echo "$as_me:$LINENO: checking if kernel expects return from cache shrink " >&5
--echo $ECHO_N "checking if kernel expects return from cache shrink ... $ECHO_C" >&6
-+		{ echo "$as_me:$LINENO: checking if kernel expects return from cache shrink " >&5
-+echo $ECHO_N "checking if kernel expects return from cache shrink ... $ECHO_C" >&6; }
- 		tmp_flags="$EXTRA_KCFLAGS"
- 		EXTRA_KCFLAGS="-Werror"
- 		cat >conftest.c <<_ACEOF
-@@ -10055,16 +10856,16 @@
- #define HAVE_CACHE_RETURN_INT 1
- _ACEOF
+@@ -9882,8 +10687,8 @@
  
--			echo "$as_me:$LINENO: result: yes" >&5
+     fi
+ else
+-    echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+			{ echo "$as_me:$LINENO: result: yes" >&5
++    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
  
--			echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+			{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
- fi
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -10075,8 +10876,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--		echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+		{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
- fi
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -10084,8 +10885,8 @@
- fi
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ cat >>confdefs.h <<\_ACEOF
+@@ -9895,8 +10700,8 @@
  
--          echo "$as_me:$LINENO: checking if kernel defines grab_cache_page_nowait_gfp()" >&5
--echo $ECHO_N "checking if kernel defines grab_cache_page_nowait_gfp()... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: checking if kernel defines grab_cache_page_nowait_gfp()" >&5
-+echo $ECHO_N "checking if kernel defines grab_cache_page_nowait_gfp()... $ECHO_C" >&6; }
- HAVE_GCPN_GFP="`grep -c 'grab_cache_page_nowait_gfp' $LINUX/include/linux/pagemap.h`"
- if test "$HAVE_GCPN_GFP" != 0 ; then
  
-@@ -10093,15 +10894,15 @@
- #define HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP 1
- _ACEOF
- 
--	echo "$as_me:$LINENO: result: yes" >&5
+     else
+-    	echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+	{ echo "$as_me:$LINENO: result: yes" >&5
++    	{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
- else
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
  
--          echo "$as_me:$LINENO: checking if kernel has new dev_set_rdonly" >&5
--echo $ECHO_N "checking if kernel has new dev_set_rdonly... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: checking if kernel has new dev_set_rdonly" >&5
-+echo $ECHO_N "checking if kernel has new dev_set_rdonly... $ECHO_C" >&6; }
- cat >conftest.c <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10137,8 +10938,8 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
  
  cat >>confdefs.h <<\_ACEOF
- #define HAVE_DEV_SET_RDONLY 1
-@@ -10150,16 +10951,16 @@
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9906,8 +10711,8 @@
  
- 
--        echo "$as_me:$LINENO: result: no, Linux kernel source needs to be patches by lustre
-+        { echo "$as_me:$LINENO: result: no, Linux kernel source needs to be patches by lustre
- kernel patches from Lustre version 1.4.3 or above." >&5
- echo "${ECHO_T}no, Linux kernel source needs to be patches by lustre
--kernel patches from Lustre version 1.4.3 or above." >&6
-+kernel patches from Lustre version 1.4.3 or above." >&6; }
- 
- fi
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
- 
--          echo "$as_me:$LINENO: checking whether filemap_fdatawrite() is defined" >&5
--echo $ECHO_N "checking whether filemap_fdatawrite() is defined... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: checking whether filemap_fdatawrite() is defined" >&5
-+echo $ECHO_N "checking whether filemap_fdatawrite() is defined... $ECHO_C" >&6; }
- cat >conftest.c <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10193,8 +10994,8 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--	echo "$as_me:$LINENO: result: yes" >&5
+     fi
+ else
+-    echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+	{ echo "$as_me:$LINENO: result: yes" >&5
++    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_FILEMAP_FDATAWRITE 1
-@@ -10206,14 +11007,14 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
  
+ cat >>confdefs.h <<\_ACEOF
+@@ -9918,8 +10723,8 @@
  fi
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ 
  
 -          echo "$as_me:$LINENO: checking if struct statfs has a f_namelen field" >&5
 -echo $ECHO_N "checking if struct statfs has a f_namelen field... $ECHO_C" >&6
@@ -33775,7 +34153,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10248,8 +11049,8 @@
+@@ -9954,8 +10759,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -33786,7 +34164,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_STATFS_NAMELEN 1
-@@ -10261,14 +11062,14 @@
+@@ -9967,14 +10772,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -33798,66 +34176,6 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  
--          echo "$as_me:$LINENO: checking if kernel offers page_mapped" >&5
--echo $ECHO_N "checking if kernel offers page_mapped... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: checking if kernel offers page_mapped" >&5
-+echo $ECHO_N "checking if kernel offers page_mapped... $ECHO_C" >&6; }
- cat >conftest.c <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10302,8 +11103,8 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--	echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_PAGE_MAPPED 1
-@@ -10315,14 +11116,14 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
- fi
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
- 
--          echo "$as_me:$LINENO: checking if struct file_operations has an unlocked_ioctl field" >&5
--echo $ECHO_N "checking if struct file_operations has an unlocked_ioctl field... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: checking if struct file_operations has an unlocked_ioctl field" >&5
-+echo $ECHO_N "checking if struct file_operations has an unlocked_ioctl field... $ECHO_C" >&6; }
- cat >conftest.c <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10357,8 +11158,8 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_UNLOCKED_IOCTL 1
-@@ -10370,14 +11171,14 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--        echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+        { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
- fi
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
- 
 -          echo "$as_me:$LINENO: checking for exported filemap_populate" >&5
 -echo $ECHO_N "checking for exported filemap_populate... $ECHO_C" >&6
 +          { echo "$as_me:$LINENO: checking for exported filemap_populate" >&5
@@ -33865,7 +34183,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10412,8 +11213,8 @@
+@@ -10009,8 +10814,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -33876,7 +34194,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FILEMAP_POPULATE 1
-@@ -10425,14 +11226,14 @@
+@@ -10022,14 +10827,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -33895,7 +34213,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10466,8 +11267,8 @@
+@@ -10063,8 +10868,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -33906,7 +34224,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_D_ADD_UNIQUE 1
-@@ -10479,16 +11280,16 @@
+@@ -10076,16 +10881,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -33928,7 +34246,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX/include/linux/bit_spinlock.h"; then
-@@ -10497,12 +11298,13 @@
+@@ -10094,12 +10899,13 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -33946,7 +34264,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10536,8 +11338,8 @@
+@@ -10133,8 +10939,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -33957,7 +34275,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_BIT_SPINLOCK_H 1
-@@ -10549,8 +11351,8 @@
+@@ -10146,8 +10952,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -33968,7 +34286,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -10559,9 +11361,9 @@
+@@ -10156,9 +10962,9 @@
  
  
            as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/xattr_acl.h" | $as_tr_sh`
@@ -33981,7 +34299,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX/include/linux/xattr_acl.h"; then
-@@ -10570,12 +11372,13 @@
+@@ -10167,12 +10973,13 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -33999,7 +34317,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10607,8 +11410,8 @@
+@@ -10204,8 +11011,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34010,7 +34328,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_XATTR_ACL 1
-@@ -10620,8 +11423,8 @@
+@@ -10217,8 +11024,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34021,7 +34339,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -10629,8 +11432,8 @@
+@@ -10226,8 +11033,8 @@
  fi
  
  
@@ -34032,7 +34350,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10666,8 +11469,8 @@
+@@ -10263,8 +11070,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34043,7 +34361,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FILE_IN_STRUCT_INTENT 1
-@@ -10679,16 +11482,16 @@
+@@ -10276,16 +11083,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34065,7 +34383,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX/include/linux/posix_acl_xattr.h"; then
-@@ -10697,12 +11500,13 @@
+@@ -10294,12 +11101,13 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -34083,7 +34401,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
          cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10734,8 +11538,8 @@
+@@ -10331,8 +11139,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34094,7 +34412,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LINUX_POSIX_ACL_XATTR_H 1
-@@ -10748,8 +11552,8 @@
+@@ -10345,8 +11153,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34105,7 +34423,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -10757,14 +11561,14 @@
+@@ -10354,14 +11162,14 @@
  
  else
  
@@ -34124,7 +34442,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]__iget[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -10778,13 +11582,13 @@
+@@ -10375,13 +11183,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -34142,7 +34460,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10794,8 +11598,8 @@
+@@ -10391,8 +11199,8 @@
  
      fi
  else
@@ -34153,7 +34471,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10806,8 +11610,8 @@
+@@ -10403,8 +11211,8 @@
  fi
  
  
@@ -34164,7 +34482,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10846,22 +11650,22 @@
+@@ -10443,22 +11251,22 @@
  #define HAVE_MS_FLOCK_LOCK 1
  _ACEOF
  
@@ -34193,7 +34511,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10903,22 +11707,22 @@
+@@ -10500,22 +11308,22 @@
  #define HAVE_CAN_SLEEP_ARG 1
  _ACEOF
  
@@ -34222,7 +34540,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10958,22 +11762,22 @@
+@@ -10555,22 +11363,22 @@
  #define HAVE_F_OP_FLOCK 1
  _ACEOF
  
@@ -34251,7 +34569,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11008,8 +11812,8 @@
+@@ -10605,8 +11413,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34262,7 +34580,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define KERNEL_SUPPORTS_QUOTA_READ 1
-@@ -11021,14 +11825,14 @@
+@@ -10618,14 +11426,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34281,7 +34599,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11071,22 +11875,22 @@
+@@ -10668,22 +11476,22 @@
  #define HAVE_COOKIE_FOLLOW_LINK 1
  _ACEOF
  
@@ -34310,7 +34628,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11123,11 +11927,11 @@
+@@ -10720,11 +11528,11 @@
  #define HAVE_RCU 1
  _ACEOF
  
@@ -34326,7 +34644,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
          cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11167,16 +11971,16 @@
+@@ -10764,16 +11572,16 @@
  #define HAVE_CALL_RCU_PARAM 1
  _ACEOF
  
@@ -34347,7 +34665,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -11187,14 +11991,14 @@
+@@ -10784,14 +11592,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34366,7 +34684,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11231,11 +12035,11 @@
+@@ -10828,11 +11636,11 @@
  #define HAVE_PERCPU_COUNTER 1
  _ACEOF
  
@@ -34382,7 +34700,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
          cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11275,16 +12079,16 @@
+@@ -10872,16 +11680,16 @@
  #define HAVE_PERCPU_2ND_ARG 1
  _ACEOF
  
@@ -34403,7 +34721,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -11294,15 +12098,15 @@
+@@ -10891,15 +11699,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34423,7 +34741,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11343,8 +12147,8 @@
+@@ -10940,8 +11748,8 @@
  #define HAVE_QUOTA64 1
  _ACEOF
  
@@ -34434,7 +34752,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -11392,16 +12196,16 @@
+@@ -10989,16 +11797,16 @@
  #define HAVE_QUOTA64 1
  _ACEOF
  
@@ -34455,7 +34773,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
                  { echo "$as_me:$LINENO: WARNING: 4 TB (or larger) block quota limits can only be used with OSTs not larger than 4 TB." >&5
  echo "$as_me: WARNING: 4 TB (or larger) block quota limits can only be used with OSTs not larger than 4 TB." >&2;}
                  { echo "$as_me:$LINENO: WARNING: Continuing with limited quota support." >&5
-@@ -11417,8 +12221,8 @@
+@@ -11014,8 +11822,8 @@
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  fi
  
@@ -34466,7 +34784,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11457,8 +12261,8 @@
+@@ -11054,8 +11862,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34477,7 +34795,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_4ARGS_VFS_SYMLINK 1
-@@ -11470,16 +12274,16 @@
+@@ -11067,16 +11875,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34498,7 +34816,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11520,8 +12324,8 @@
+@@ -11117,8 +11925,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34509,7 +34827,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_VFS_INTENT_PATCHES 1
-@@ -11533,16 +12337,16 @@
+@@ -11130,16 +11938,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34530,7 +34848,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]sysctl_vfs_cache_pressure[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -11556,13 +12360,13 @@
+@@ -11153,13 +11961,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -34548,7 +34866,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -11572,8 +12376,8 @@
+@@ -11169,8 +11977,8 @@
  
      fi
  else
@@ -34559,7 +34877,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -11586,8 +12390,8 @@
+@@ -11183,8 +11991,8 @@
  
  
            # 2.6.12
@@ -34570,7 +34888,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  tmp_flags="$EXTRA_KCFLAGS"
  EXTRA_KCFLAGS="-Werror"
  cat >conftest.c <<_ACEOF
-@@ -11625,8 +12429,8 @@
+@@ -11222,8 +12030,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34581,7 +34899,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RW_TREE_LOCK 1
-@@ -11638,15 +12442,15 @@
+@@ -11235,15 +12043,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34601,7 +34919,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]synchronize_rcu[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -11660,13 +12464,13 @@
+@@ -11257,13 +12065,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -34619,7 +34937,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -11676,8 +12480,8 @@
+@@ -11273,8 +12081,8 @@
  
      fi
  else
@@ -34630,7 +34948,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -11690,8 +12494,8 @@
+@@ -11287,8 +12095,8 @@
  
  
            # 2.6.15
@@ -34641,7 +34959,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11729,8 +12533,8 @@
+@@ -11326,8 +12134,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34652,7 +34970,67 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_INODE_I_MUTEX 1
-@@ -11742,16 +12546,16 @@
+@@ -11339,14 +12147,14 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ 
+-          echo "$as_me:$LINENO: checking if kernel has atomic_cmpxchg" >&5
+-echo $ECHO_N "checking if kernel has atomic_cmpxchg... $ECHO_C" >&6
++          { echo "$as_me:$LINENO: checking if kernel has atomic_cmpxchg" >&5
++echo $ECHO_N "checking if kernel has atomic_cmpxchg... $ECHO_C" >&6; }
+ cat >conftest.c <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11382,8 +12190,8 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_ATOMIC_CMPXCHG 1
+@@ -11395,14 +12203,14 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ 
+-          echo "$as_me:$LINENO: checking if kernel has atomic_inc_not_zero" >&5
+-echo $ECHO_N "checking if kernel has atomic_inc_not_zero... $ECHO_C" >&6
++          { echo "$as_me:$LINENO: checking if kernel has atomic_inc_not_zero" >&5
++echo $ECHO_N "checking if kernel has atomic_inc_not_zero... $ECHO_C" >&6; }
+ cat >conftest.c <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11438,8 +12246,8 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_ATOMIC_INC_NOT_ZERO 1
+@@ -11451,16 +12259,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34673,7 +35051,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11789,8 +12593,8 @@
+@@ -11498,8 +12306,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34684,7 +35062,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SECURITY_PLUG 1
-@@ -11802,16 +12606,16 @@
+@@ -11511,16 +12319,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34705,7 +35083,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11849,8 +12653,8 @@
+@@ -11558,8 +12366,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34716,7 +35094,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_DQUOTOFF_MUTEX 1
-@@ -11862,16 +12666,16 @@
+@@ -11571,16 +12379,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34737,7 +35115,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11905,8 +12709,8 @@
+@@ -11614,8 +12422,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34748,7 +35126,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NR_PAGECACHE 1
-@@ -11918,14 +12722,14 @@
+@@ -11627,14 +12435,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34767,7 +35145,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11964,22 +12768,22 @@
+@@ -11673,22 +12481,22 @@
  #define HAVE_STATFS_DENTRY_PARAM 1
  _ACEOF
  
@@ -34796,7 +35174,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12018,22 +12822,22 @@
+@@ -11727,22 +12535,22 @@
  #define HAVE_VFS_KERN_MOUNT 1
  _ACEOF
  
@@ -34825,7 +35203,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12067,8 +12871,8 @@
+@@ -11776,8 +12584,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34836,7 +35214,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_INVALIDATEPAGE_RETURN_INT 1
-@@ -12080,14 +12884,14 @@
+@@ -11789,14 +12597,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34855,7 +35233,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  tmp_flags="$EXTRA_KCFLAGS"
  EXTRA_KCFLAGS="-Werror"
  cat >conftest.c <<_ACEOF
-@@ -12133,8 +12937,8 @@
+@@ -11842,8 +12650,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34866,7 +35244,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_UMOUNTBEGIN_VFSMOUNT 1
-@@ -12146,15 +12950,15 @@
+@@ -11855,15 +12663,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34886,7 +35264,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12189,8 +12993,8 @@
+@@ -11898,8 +12706,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -34897,7 +35275,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_INODE_IPRIVATE 1
-@@ -12202,14 +13006,14 @@
+@@ -11911,14 +12719,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -34916,7 +35294,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]filemap_fdatawrite_range[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -12223,13 +13027,13 @@
+@@ -11932,13 +12740,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -34934,7 +35312,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -12239,8 +13043,8 @@
+@@ -11948,8 +12756,8 @@
  
      fi
  else
@@ -34945,7 +35323,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -12252,8 +13056,8 @@
+@@ -11961,8 +12769,8 @@
  
  
            if test x$enable_server = xyes ; then
@@ -34956,7 +35334,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]invalidate_mapping_pages[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -12267,10 +13071,10 @@
+@@ -11976,10 +12784,10 @@
  	fi
      done
      if test $export -eq 0; then
@@ -34971,7 +35349,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]invalidate_inode_pages[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -12284,16 +13088,16 @@
+@@ -11993,16 +12801,16 @@
  	fi
      done
      if test $export -eq 0; then
@@ -34992,7 +35370,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -12302,8 +13106,8 @@
+@@ -12011,8 +12819,8 @@
  
      fi
  else
@@ -35003,7 +35381,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -12314,8 +13118,8 @@
+@@ -12023,8 +12831,8 @@
  
  
      else
@@ -35014,7 +35392,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -12324,8 +13128,8 @@
+@@ -12033,8 +12841,8 @@
  
      fi
  else
@@ -35025,7 +35403,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -12338,8 +13142,8 @@
+@@ -12047,8 +12855,8 @@
            fi
  
            #2.6.18 + RHEL5 (fc6)
@@ -35036,7 +35414,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12376,8 +13180,8 @@
+@@ -12085,8 +12893,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35047,7 +35425,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_PG_FS_MISC 1
-@@ -12389,14 +13193,14 @@
+@@ -12098,14 +12906,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35066,7 +35444,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12441,8 +13245,8 @@
+@@ -12150,8 +12958,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35077,7 +35455,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_PAGE_CHECKED 1
-@@ -12454,16 +13258,16 @@
+@@ -12163,16 +12971,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35089,6 +35467,58 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  
+           as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/fiemap.h" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $LINUX/include/linux/fiemap.h" >&5
+-echo $ECHO_N "checking for $LINUX/include/linux/fiemap.h... $ECHO_C" >&6
+-if eval "test \"\${$as_lb_File+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $LINUX/include/linux/fiemap.h" >&5
++echo $ECHO_N "checking for $LINUX/include/linux/fiemap.h... $ECHO_C" >&6; }
++if { as_var=$as_lb_File; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -r "$LINUX/include/linux/fiemap.h"; then
+@@ -12181,12 +12989,13 @@
+   eval "$as_lb_File=no"
+ fi
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_lb_File'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_lb_File'}'`" >&6
++ac_res=`eval echo '${'$as_lb_File'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_lb_File'}'` = yes; then
+ 
+-        echo "$as_me:$LINENO: checking if fiemap.h can be compiled" >&5
+-echo $ECHO_N "checking if fiemap.h can be compiled... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking if fiemap.h can be compiled" >&5
++echo $ECHO_N "checking if fiemap.h can be compiled... $ECHO_C" >&6; }
+         cat >conftest.c <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -12219,8 +13028,8 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-                echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++                { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LINUX_FIEMAP_H 1
+@@ -12232,8 +13041,8 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-                echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++                { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+@@ -12243,8 +13052,8 @@
+ 
  
            # 2.6.19
 -          echo "$as_me:$LINENO: checking inode has i_blksize field" >&5
@@ -35098,7 +35528,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12498,8 +13302,8 @@
+@@ -12279,8 +13088,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35109,7 +35539,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_INODE_BLKSIZE 1
-@@ -12511,14 +13315,14 @@
+@@ -12292,14 +13101,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35128,7 +35558,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  tmp_flags="$EXTRA_KCFLAGS"
  EXTRA_KCFLAGS="-Werror"
  cat >conftest.c <<_ACEOF
-@@ -12562,8 +13366,8 @@
+@@ -12343,8 +13152,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35139,7 +35569,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_VFS_READDIR_U64_INO 1
-@@ -12575,15 +13379,15 @@
+@@ -12356,15 +13165,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35159,7 +35589,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12617,8 +13421,8 @@
+@@ -12398,8 +13207,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35170,13 +35600,13 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FILE_UPDATE_TIME 1
-@@ -12630,14 +13434,14 @@
+@@ -12411,14 +13220,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
--       echo "$as_me:$LINENO: result: no" >&5
+-	echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+       { echo "$as_me:$LINENO: result: no" >&5
++	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  
  fi
@@ -35189,7 +35619,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12672,8 +13476,8 @@
+@@ -12453,8 +13262,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35200,7 +35630,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FILE_WRITEV 1
-@@ -12685,14 +13489,14 @@
+@@ -12466,14 +13275,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35219,7 +35649,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12727,8 +13531,8 @@
+@@ -12508,8 +13317,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35230,7 +35660,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FILE_READV 1
-@@ -12740,16 +13544,16 @@
+@@ -12521,16 +13330,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35251,7 +35681,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12788,8 +13592,8 @@
+@@ -12569,8 +13378,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35262,7 +35692,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_CANCEL_DIRTY_PAGE 1
-@@ -12801,16 +13605,16 @@
+@@ -12582,16 +13391,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35283,7 +35713,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12847,8 +13651,8 @@
+@@ -12628,8 +13437,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35294,7 +35724,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_PAGE_CONSTANT 1
-@@ -12860,16 +13664,16 @@
+@@ -12641,16 +13450,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35315,7 +35745,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12903,8 +13707,8 @@
+@@ -12684,8 +13493,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35326,7 +35756,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_INVALIDATE_BDEV_2ARG 1
-@@ -12916,14 +13720,14 @@
+@@ -12697,14 +13506,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35345,7 +35775,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12957,8 +13761,8 @@
+@@ -12738,8 +13547,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35356,7 +35786,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FS_RENAME_DOES_D_MOVE 1
-@@ -12970,15 +13774,15 @@
+@@ -12751,15 +13560,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35376,7 +35806,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13012,8 +13816,8 @@
+@@ -12793,8 +13602,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35387,7 +35817,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_UNREGISTER_BLKDEV_RETURN_INT 1
-@@ -13025,14 +13829,14 @@
+@@ -12806,14 +13615,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35406,7 +35836,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13068,8 +13872,8 @@
+@@ -12849,8 +13658,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35417,7 +35847,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_KERNEL_SENDFILE 1
-@@ -13081,14 +13885,14 @@
+@@ -12862,14 +13671,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35436,7 +35866,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13124,8 +13928,8 @@
+@@ -12905,8 +13714,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35447,7 +35877,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_KERNEL_SPLICE_READ 1
-@@ -13137,16 +13941,16 @@
+@@ -12918,16 +13727,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35469,7 +35899,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX/include/linux/exportfs.h"; then
-@@ -13155,8 +13959,9 @@
+@@ -12936,8 +13745,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -35481,7 +35911,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
  
  
-@@ -13167,14 +13972,14 @@
+@@ -12948,14 +13758,14 @@
  
  else
  
@@ -35500,7 +35930,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13210,8 +14015,8 @@
+@@ -12991,8 +13801,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35511,7 +35941,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_VM_OP_FAULT 1
-@@ -13223,14 +14028,14 @@
+@@ -13004,14 +13814,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35523,35 +35953,76 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  
--          echo "$as_me:$LINENO: checking if kernel has register_shrinker" >&5
--echo $ECHO_N "checking if kernel has register_shrinker... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: checking if kernel has register_shrinker" >&5
-+echo $ECHO_N "checking if kernel has register_shrinker... $ECHO_C" >&6; }
- cat >conftest.c <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -13264,8 +14069,8 @@
+-          echo "$as_me:$LINENO: checking if Linux was built with symbol register_shrinker exported" >&5
+-echo $ECHO_N "checking if Linux was built with symbol register_shrinker exported... $ECHO_C" >&6
++          { echo "$as_me:$LINENO: checking if Linux was built with symbol register_shrinker exported" >&5
++echo $ECHO_N "checking if Linux was built with symbol register_shrinker exported... $ECHO_C" >&6; }
+ grep -q -E '[[:space:]]register_shrinker[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
+ rc=$?
+ if test $rc -ne 0; then
+@@ -13025,11 +13835,11 @@
+ 	fi
+     done
+     if test $export -eq 0; then
+-    	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+-        echo "$as_me:$LINENO: checking if kernel using gfp_t for shrinker second paramter" >&5
+-echo $ECHO_N "checking if kernel using gfp_t for shrinker second paramter... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking if kernel using gfp_t for shrinker second paramter" >&5
++echo $ECHO_N "checking if kernel using gfp_t for shrinker second paramter... $ECHO_C" >&6; }
+         tmp_flags="$EXTRA_KCFLAGS"
+         EXTRA_KCFLAGS="-Werror"
+         cat >conftest.c <<_ACEOF
+@@ -13068,8 +13878,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
--        echo "$as_me:$LINENO: result: yes" >&5
+-                echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+        { echo "$as_me:$LINENO: result: yes" >&5
++                { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  
  cat >>confdefs.h <<\_ACEOF
- #define HAVE_REGISTER_SHRINKER 1
-@@ -13277,14 +14082,14 @@
+ #define SHRINKER_MASK_T gfp_t
+@@ -13081,8 +13891,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
--        echo "$as_me:$LINENO: result: no" >&5
+-                echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+        { echo "$as_me:$LINENO: result: no" >&5
++                { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  
+ cat >>confdefs.h <<\_ACEOF
+ #define SHRINKER_MASK_T unsigned int
+@@ -13094,8 +13904,8 @@
+         EXTRA_KCFLAGS="$tmp_flags"
+ 
+     else
+-    	echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -13105,8 +13915,8 @@
+ 
+     fi
+ else
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -13117,8 +13927,8 @@
  fi
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ 
  
 -          echo "$as_me:$LINENO: checking if kernel has pde_users member in procfs entry struct" >&5
 -echo $ECHO_N "checking if kernel has pde_users member in procfs entry struct... $ECHO_C" >&6
@@ -35560,7 +36031,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13320,8 +14125,8 @@
+@@ -13154,8 +13964,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35571,7 +36042,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_PROCFS_USERS 1
-@@ -13333,16 +14138,16 @@
+@@ -13167,16 +13977,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35592,7 +36063,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13378,8 +14183,8 @@
+@@ -13212,8 +14022,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35603,7 +36074,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_MAPPING_CAP_WRITEBACK_DIRTY 1
-@@ -13391,8 +14196,8 @@
+@@ -13225,8 +14035,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35614,7 +36085,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -13400,9 +14205,9 @@
+@@ -13234,9 +14044,9 @@
  
            # 2.6.24
            as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/mm_types.h" | $as_tr_sh`
@@ -35627,7 +36098,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX/include/linux/mm_types.h"; then
-@@ -13411,8 +14216,9 @@
+@@ -13245,8 +14055,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -35639,7 +36110,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
  
  
-@@ -13423,14 +14229,14 @@
+@@ -13257,14 +14068,14 @@
  
  else
  
@@ -35658,7 +36129,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13464,8 +14270,8 @@
+@@ -13298,8 +14109,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35669,7 +36140,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_BIO_ENDIO_2ARG 1
-@@ -13477,14 +14283,14 @@
+@@ -13311,14 +14122,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35688,7 +36159,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13524,8 +14330,8 @@
+@@ -13358,8 +14169,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35699,7 +36170,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FH_TO_DENTRY 1
-@@ -13537,14 +14343,14 @@
+@@ -13371,14 +14182,14 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35718,7 +36189,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13580,8 +14386,8 @@
+@@ -13414,8 +14225,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35729,7 +36200,38 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_PROCFS_DELETED 1
-@@ -13593,16 +14399,16 @@
+@@ -13427,16 +14238,16 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ 
+ 
+           # 2.6.24-19-generic Ubuntu
+-          echo "$as_me:$LINENO: checking kernel has a remove_suid that takes a struct path" >&5
+-echo $ECHO_N "checking kernel has a remove_suid that takes a struct path... $ECHO_C" >&6
++          { echo "$as_me:$LINENO: checking kernel has a remove_suid that takes a struct path" >&5
++echo $ECHO_N "checking kernel has a remove_suid that takes a struct path... $ECHO_C" >&6; }
+ cat >conftest.c <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -13476,24 +14287,24 @@
+ #define HAVE_PATH_REMOVE_SUID 1
+ _ACEOF
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35750,7 +36252,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13641,8 +14447,8 @@
+@@ -13532,8 +14343,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35761,7 +36263,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FS_STRUCT_USE_PATH 1
-@@ -13654,8 +14460,8 @@
+@@ -13545,16 +14356,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35772,8 +36274,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -13663,8 +14469,8 @@
-           LC_RCU_LIST_SAFE
+ 
  
            # 2.6.27
 -          echo "$as_me:$LINENO: checking inode_operations->permission have two args" >&5
@@ -35783,7 +36284,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13705,22 +14511,22 @@
+@@ -13595,22 +14406,22 @@
  #define HAVE_INODE_PERMISION_2ARGS 1
  _ACEOF
  
@@ -35812,7 +36313,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13759,22 +14565,22 @@
+@@ -13649,22 +14460,22 @@
  #define HAVE_FILE_REMOVE_SUID 1
  _ACEOF
  
@@ -35841,7 +36342,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13813,22 +14619,22 @@
+@@ -13703,22 +14514,22 @@
  #define HAVE_TRYLOCK_PAGE 1
  _ACEOF
  
@@ -35870,7 +36371,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  tmp_flags="$EXTRA_KCFLAGS"
  EXTRA_KCFLAGS="-Werror"
  cat >conftest.c <<_ACEOF
-@@ -13866,8 +14672,8 @@
+@@ -13756,8 +14567,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -35881,7 +36382,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RW_TREE_LOCK 1
-@@ -13879,15 +14685,15 @@
+@@ -13769,15 +14580,15 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -35901,7 +36402,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13927,22 +14733,22 @@
+@@ -13817,22 +14628,22 @@
  #define HAVE_READ_INODE_IN_SBOPS 1
  _ACEOF
  
@@ -35930,7 +36431,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  grep -q -E '[[:space:]]inode_permission[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -13956,13 +14762,13 @@
+@@ -13846,13 +14657,13 @@
  	fi
      done
      if test $export -eq 0; then
@@ -35948,7 +36449,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -13972,8 +14778,8 @@
+@@ -13862,8 +14673,8 @@
  
      fi
  else
@@ -35959,7 +36460,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -13984,8 +14790,8 @@
+@@ -13874,8 +14685,8 @@
  fi
  
  
@@ -35970,7 +36471,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14025,22 +14831,22 @@
+@@ -13915,22 +14726,22 @@
  #define HAVE_QUOTA_ON_5ARGS 1
  _ACEOF
  
@@ -35999,7 +36500,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14080,22 +14886,22 @@
+@@ -13970,22 +14781,22 @@
  #define HAVE_QUOTA_OFF_3ARGS 1
  _ACEOF
  
@@ -36028,7 +36529,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14134,24 +14940,24 @@
+@@ -14024,24 +14835,24 @@
  #define HAVE_VFS_DQ_OFF 1
  _ACEOF
  
@@ -36059,7 +36560,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14191,24 +14997,24 @@
+@@ -14081,24 +14892,24 @@
  #define HAVE_BI_HW_SEGMENTS 1
  _ACEOF
  
@@ -36091,7 +36592,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX/include/linux/quotaio_v1.h"; then
-@@ -14217,8 +15023,9 @@
+@@ -14107,8 +14918,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36103,7 +36604,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
  
  
-@@ -14229,14 +15036,14 @@
+@@ -14119,14 +14931,14 @@
  
  else
  
@@ -36122,7 +36623,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14279,22 +15086,22 @@
+@@ -14169,22 +14981,22 @@
  #define HAVE_VFS_SYMLINK_5ARGS 1
  _ACEOF
  
@@ -36151,7 +36652,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14333,22 +15140,22 @@
+@@ -14223,22 +15035,22 @@
  #define HAVE_SB_ANY_QUOTA_ACTIVE 1
  _ACEOF
  
@@ -36180,7 +36681,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14387,16 +15194,16 @@
+@@ -14277,24 +15089,24 @@
  #define HAVE_SB_HAS_QUOTA_ACTIVE 1
  _ACEOF
  
@@ -36201,7 +36702,126 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -14404,102 +15211,7 @@
+ 
+ 
+           #2.6.29
+-          echo "$as_me:$LINENO: checking if kernel has .write_begin/end" >&5
+-echo $ECHO_N "checking if kernel has .write_begin/end... $ECHO_C" >&6
++          { echo "$as_me:$LINENO: checking if kernel has .write_begin/end" >&5
++echo $ECHO_N "checking if kernel has .write_begin/end... $ECHO_C" >&6; }
+ cat >conftest.c <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -14337,8 +15149,8 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_KERNEL_WRITE_BEGIN_END 1
+@@ -14350,14 +15162,14 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ 
+-          echo "$as_me:$LINENO: checking d_obtain_alias exist in kernel" >&5
+-echo $ECHO_N "checking d_obtain_alias exist in kernel... $ECHO_C" >&6
++          { echo "$as_me:$LINENO: checking d_obtain_alias exist in kernel" >&5
++echo $ECHO_N "checking d_obtain_alias exist in kernel... $ECHO_C" >&6; }
+ cat >conftest.c <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -14396,22 +15208,22 @@
+ #define HAVE_D_OBTAIN_ALIAS 1
+ _ACEOF
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ 
+-          echo "$as_me:$LINENO: checking blkdev_put needs 2 parameters" >&5
+-echo $ECHO_N "checking blkdev_put needs 2 parameters... $ECHO_C" >&6
++          { echo "$as_me:$LINENO: checking blkdev_put needs 2 parameters" >&5
++echo $ECHO_N "checking blkdev_put needs 2 parameters... $ECHO_C" >&6; }
+ cat >conftest.c <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -14450,22 +15262,22 @@
+ #define HAVE_BLKDEV_PUT_2ARGS 1
+ _ACEOF
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+ 
+-          echo "$as_me:$LINENO: checking dentry_open needs 4 parameters" >&5
+-echo $ECHO_N "checking dentry_open needs 4 parameters... $ECHO_C" >&6
++          { echo "$as_me:$LINENO: checking dentry_open needs 4 parameters" >&5
++echo $ECHO_N "checking dentry_open needs 4 parameters... $ECHO_C" >&6; }
+ cat >conftest.c <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -14504,16 +15316,16 @@
+ #define HAVE_DENTRY_OPEN_4ARGS 1
+ _ACEOF
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
+@@ -14521,102 +15333,7 @@
  
  			;;
  		darwin*)
@@ -36305,8 +36925,8 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  			LIBCFS_PROG_DARWIN
  			;;
  		*)
-@@ -14513,8 +15225,8 @@
- 
+@@ -14629,8 +15346,8 @@
+ fi
  
  
 -echo "$as_me:$LINENO: checking userspace __u64 is long long type" >&5
@@ -36316,7 +36936,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  tmp_flags="$CFLAGS"
  CFLAGS="$CFLAGS -Werror"
  cat >conftest.$ac_ext <<_ACEOF
-@@ -14531,30 +15243,25 @@
+@@ -14647,30 +15364,25 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36360,7 +36980,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_USER__U64_LONG_LONG 1
-@@ -14566,24 +15273,25 @@
+@@ -14682,20 +15394,20 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -36377,6 +36997,40 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  
+ if test x$RHEL_KERNEL = xyes; then
+-	# Check whether --enable-ext4 or --disable-ext4 was given.
++	# Check whether --enable-ext4 was given.
+ if test "${enable_ext4+set}" = set; then
+-  enableval="$enable_ext4"
+-
++  enableval=$enable_ext4;
+ else
+ 
+ 			if test x$ldiskfs_is_ext4 = xyes; then
+@@ -14704,7 +15416,8 @@
+ 				enable_ext4=no
+ 			fi
+ 
+-fi;
++fi
++
+ else
+ 	case $LINUXRELEASE in
+ 	# ext4 was in 2.6.22-2.6.26 but not stable enough to use
+@@ -14720,21 +15433,21 @@
+ if test x$enable_ext4 = xyes; then
+ 	 ac_configure_args="$ac_configure_args --enable-ext4"
+ fi
+-echo "$as_me:$LINENO: checking whether to build ldiskfs based on ext4" >&5
+-echo $ECHO_N "checking whether to build ldiskfs based on ext4... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $enable_ext4" >&5
+-echo "${ECHO_T}$enable_ext4" >&6
++{ echo "$as_me:$LINENO: checking whether to build ldiskfs based on ext4" >&5
++echo $ECHO_N "checking whether to build ldiskfs based on ext4... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_ext4" >&5
++echo "${ECHO_T}$enable_ext4" >&6; }
+ 
+ 
 -# Check whether --enable-dmu or --disable-dmu was given.
 +# Check whether --enable-dmu was given.
  if test "${enable_dmu+set}" = set; then
@@ -36395,7 +37049,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  case x$with_dmu in
  	xyes)
  		dmu_osd='yes'
-@@ -14608,8 +15316,8 @@
+@@ -14759,8 +15472,8 @@
  		dmu_osd='yes'
  		;;
  esac
@@ -36406,7 +37060,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$dmu_osd = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -14621,9 +15329,9 @@
+@@ -14772,9 +15485,9 @@
  		DMU_SRC="$PWD/lustre/zfs-lustre"
  
  		as_lb_File=`echo "lb_cv_file_$DMU_SRC/src/.patched" | $as_tr_sh`
@@ -36419,7 +37073,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$DMU_SRC/src/.patched"; then
-@@ -14632,8 +15340,9 @@
+@@ -14783,8 +15496,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36431,7 +37085,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -14644,8 +15353,6 @@
+@@ -14795,8 +15509,6 @@
  
  fi
  
@@ -36440,8 +37094,8 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  subdirs="$subdirs lustre/zfs-lustre"
  
  	else
-@@ -14658,9 +15365,9 @@
- 
+@@ -14808,9 +15520,9 @@
+ 		ZFS_DIR="$PWD/$ZFS_SUBDIR"
  
  		as_lb_File=`echo "lb_cv_file_$SPL_DIR/module/spl/spl-generic.c" | $as_tr_sh`
 -echo "$as_me:$LINENO: checking for $SPL_DIR/module/spl/spl-generic.c" >&5
@@ -36453,7 +37107,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$SPL_DIR/module/spl/spl-generic.c"; then
-@@ -14669,8 +15376,9 @@
+@@ -14819,8 +15531,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36465,7 +37119,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -14683,9 +15391,9 @@
+@@ -14833,9 +15546,9 @@
  
  
  		as_lb_File=`echo "lb_cv_file_$ZFS_DIR/module/zfs/dmu.c" | $as_tr_sh`
@@ -36478,7 +37132,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$ZFS_DIR/module/zfs/dmu.c"; then
-@@ -14694,8 +15402,9 @@
+@@ -14844,8 +15557,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36490,7 +37144,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -14707,13 +15416,9 @@
+@@ -14857,13 +15571,9 @@
  fi
  
  
@@ -36504,7 +37158,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  subdirs="$subdirs zfs"
  
  	fi
-@@ -14740,10 +15445,9 @@
+@@ -14894,10 +15604,9 @@
  
  
  
@@ -36517,7 +37171,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
  
  		case $lb_target_os in
-@@ -14755,18 +15459,19 @@
+@@ -14909,18 +15618,19 @@
  				;;
  		esac
  
@@ -36545,7 +37199,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$srcdir/libsysio/src/rmdir.c"; then
-@@ -14775,8 +15480,9 @@
+@@ -14929,8 +15639,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36557,7 +37211,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -14791,16 +15497,16 @@
+@@ -14945,16 +15656,16 @@
  		SYSIO="$PWD/libsysio"
  		;;
  	xno)
@@ -36581,7 +37235,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$with_sysio/lib/libsysio.a"; then
-@@ -14809,8 +15515,9 @@
+@@ -14963,8 +15674,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36593,7 +37247,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -14827,15 +15534,13 @@
+@@ -14981,15 +15693,13 @@
  esac
  
  # We have to configure even if we don't build here for make dist to work
@@ -36612,7 +37266,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$srcdir/snmp/lustre-snmp.c"; then
-@@ -14844,8 +15549,9 @@
+@@ -14998,8 +15708,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36624,7 +37278,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    SNMP_DIST_SUBDIR="snmp"
  fi
-@@ -14854,10 +15560,9 @@
+@@ -15008,10 +15719,9 @@
  
  
  
@@ -36637,13 +37291,23 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
  
  		if test x$linux25$enable_server = xyesyes ; then
-@@ -14866,17 +15571,18 @@
+@@ -15020,23 +15730,24 @@
  			with_ldiskfs=no
  		fi
  
 -fi;
++fi
+ 
+-# Check whether --with-ldiskfs-inkernel or --without-ldiskfs-inkernel was given.
++
++# Check whether --with-ldiskfs-inkernel was given.
+ if test "${with_ldiskfs_inkernel+set}" = set; then
+-  withval="$with_ldiskfs_inkernel"
+-  with_ldiskfs=inkernel
+-fi;
 -echo "$as_me:$LINENO: checking location of ldiskfs" >&5
 -echo $ECHO_N "checking location of ldiskfs... $ECHO_C" >&6
++  withval=$with_ldiskfs_inkernel; with_ldiskfs=inkernel
 +fi
 +
 +{ echo "$as_me:$LINENO: checking location of ldiskfs" >&5
@@ -36664,7 +37328,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$srcdir/ldiskfs/lustre-ldiskfs.spec.in"; then
-@@ -14885,8 +15591,9 @@
+@@ -15045,8 +15756,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36676,7 +37340,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -14901,16 +15608,16 @@
+@@ -15061,16 +15773,16 @@
  		LDISKFS_DIR="$PWD/ldiskfs"
  		;;
  	xno)
@@ -36685,6 +37349,36 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +		{ echo "$as_me:$LINENO: result: disabled" >&5
 +echo "${ECHO_T}disabled" >&6; }
  		;;
+ 	xinkernel)
+-		echo "$as_me:$LINENO: result: inkernel" >&5
+-echo "${ECHO_T}inkernel" >&6
++		{ echo "$as_me:$LINENO: result: inkernel" >&5
++echo "${ECHO_T}inkernel" >&6; }
+ 		as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/ldiskfs_fs.h" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $LINUX/include/linux/ldiskfs_fs.h" >&5
+-echo $ECHO_N "checking for $LINUX/include/linux/ldiskfs_fs.h... $ECHO_C" >&6
+-if eval "test \"\${$as_lb_File+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $LINUX/include/linux/ldiskfs_fs.h" >&5
++echo $ECHO_N "checking for $LINUX/include/linux/ldiskfs_fs.h... $ECHO_C" >&6; }
++if { as_var=$as_lb_File; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -r "$LINUX/include/linux/ldiskfs_fs.h"; then
+@@ -15079,8 +15791,9 @@
+   eval "$as_lb_File=no"
+ fi
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_lb_File'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_lb_File'}'`" >&6
++ac_res=`eval echo '${'$as_lb_File'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_lb_File'}'` = yes; then
+   :
+ else
+@@ -15093,12 +15806,12 @@
+ 
+ 		;;
  	*)
 -		echo "$as_me:$LINENO: result: $with_ldiskfs" >&5
 -echo "${ECHO_T}$with_ldiskfs" >&6
@@ -36700,7 +37394,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$with_ldiskfs/ldiskfs/linux/ldiskfs_fs.h"; then
-@@ -14919,8 +15626,9 @@
+@@ -15107,8 +15820,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36712,7 +37406,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -14956,32 +15664,30 @@
+@@ -15154,32 +15868,30 @@
  fi
  
  # We have to configure even if we don't build here for make dist to work
@@ -36722,12 +37416,12 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  
--# Check whether --with- or --without- was given.
-+# Check whether --with- was given.
- if test "${with_+set}" = set; then
--  withval="$with_"
+-# Check whether --with-lustre-iokit or --without-lustre-iokit was given.
++# Check whether --with-lustre-iokit was given.
+ if test "${with_lustre_iokit+set}" = set; then
+-  withval="$with_lustre_iokit"
 -
-+  withval=$with_;
++  withval=$with_lustre_iokit;
  else
  
  			with_lustre_iokit='yes'
@@ -36756,7 +37450,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$srcdir/lustre-iokit/ior-survey/ior-survey"; then
-@@ -14990,8 +15696,9 @@
+@@ -15188,8 +15900,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36768,7 +37462,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -15006,16 +15713,16 @@
+@@ -15204,16 +15917,16 @@
  		LUSTREIOKIT="$PWD/lustre-iokit"
  		;;
  	xno)
@@ -36792,7 +37486,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$with_lustre_iokit/ior-survey/ior_survey"; then
-@@ -15024,8 +15731,9 @@
+@@ -15222,8 +15935,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -36804,7 +37498,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -15042,20 +15750,18 @@
+@@ -15240,20 +15954,18 @@
  esac
  
  # We have to configure even if we don't build here for make dist to work
@@ -36829,7 +37523,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  if test x$withval = xyes ; then
  
-@@ -15070,8 +15776,8 @@
+@@ -15268,8 +15980,8 @@
  	E2LABEL="label.ldiskfs"
  	DUMPE2FS="dump.ldiskfs"
  	E2FSCK="fsck.ldiskfs"
@@ -36840,7 +37534,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
  	E2FSPROGS="e2fsprogs"
  	MKE2FS="mke2fs"
-@@ -15080,8 +15786,8 @@
+@@ -15278,8 +15990,8 @@
  	E2LABEL="e2label"
  	DUMPE2FS="dumpe2fs"
  	E2FSCK="e2fsck"
@@ -36851,7 +37545,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -15121,13 +15827,13 @@
+@@ -15319,13 +16031,13 @@
  
  
  
@@ -36869,7 +37563,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  if test x$withval = xyes ; then
  
-@@ -15142,8 +15848,8 @@
+@@ -15340,8 +16052,8 @@
  	E2LABEL="label.ldiskfs"
  	DUMPE2FS="dump.ldiskfs"
  	E2FSCK="fsck.ldiskfs"
@@ -36880,7 +37574,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
  	E2FSPROGS="e2fsprogs"
  	MKE2FS="mke2fs"
-@@ -15152,8 +15858,8 @@
+@@ -15350,8 +16062,8 @@
  	E2LABEL="e2label"
  	DUMPE2FS="dumpe2fs"
  	E2FSCK="e2fsck"
@@ -36891,7 +37585,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -15193,13 +15899,13 @@
+@@ -15391,13 +16103,13 @@
  
  
  
@@ -36909,7 +37603,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  if test x$withval = xyes ; then
  
-@@ -15214,8 +15920,8 @@
+@@ -15412,8 +16124,8 @@
  	E2LABEL="label.ldiskfs"
  	DUMPE2FS="dump.ldiskfs"
  	E2FSCK="fsck.ldiskfs"
@@ -36920,7 +37614,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  else
  	E2FSPROGS="e2fsprogs"
  	MKE2FS="mke2fs"
-@@ -15224,8 +15930,8 @@
+@@ -15422,8 +16134,8 @@
  	E2LABEL="e2label"
  	DUMPE2FS="dumpe2fs"
  	E2FSCK="e2fsck"
@@ -36931,7 +37625,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -15264,46 +15970,46 @@
+@@ -15462,46 +16174,46 @@
  
  
  
@@ -37002,7 +37696,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_liblustre_acl = xyes ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -15315,10 +16021,9 @@
+@@ -15513,10 +16225,9 @@
  #
  # --enable-mpitest
  #
@@ -37015,7 +37709,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	 enable_mpitests=yes
           case $enableval in
           yes)
-@@ -15338,11 +16043,12 @@
+@@ -15536,11 +16247,12 @@
  	enable_mpitests=yes
  
  
@@ -37031,7 +37725,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	oldcc=$CC
  	CC=$MPICC_WRAPPER
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -15366,42 +16072,39 @@
+@@ -15564,42 +16276,39 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37092,7 +37786,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
        conftest$ac_exeext conftest.$ac_ext
  	CC=$oldcc
  fi
-@@ -15411,17 +16114,17 @@
+@@ -15609,17 +16318,17 @@
  echo "$as_me: Enabling Lustre configure options for libsysio" >&6;}
  ac_configure_args="$ac_configure_args --with-lustre-hack --with-sockets"
  
@@ -37118,7 +37812,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_pinger != xno ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -15430,17 +16133,17 @@
+@@ -15628,17 +16337,17 @@
  
  fi
  
@@ -37144,7 +37838,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_liblustre_recovery != xno ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -15460,18 +16163,19 @@
+@@ -15658,18 +16367,19 @@
  for ac_header in netdb.h netinet/tcp.h asm/types.h endian.h sys/ioctl.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37172,7 +37866,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -15482,27 +16186,22 @@
+@@ -15680,27 +16390,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37211,7 +37905,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -15510,13 +16209,14 @@
+@@ -15708,13 +16413,14 @@
  
  ac_header_compiler=no
  fi
@@ -37231,7 +37925,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -15525,24 +16225,22 @@
+@@ -15723,24 +16429,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -37267,7 +37961,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -15550,9 +16248,10 @@
+@@ -15748,9 +16452,10 @@
  
    ac_header_preproc=no
  fi
@@ -37280,7 +37974,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -15576,25 +16275,24 @@
+@@ -15774,25 +16479,24 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -37314,7 +38008,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -15612,9 +16310,9 @@
+@@ -15810,9 +16514,9 @@
  for ac_func in gethostbyname socket connect
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -37327,7 +38021,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -15640,56 +16338,46 @@
+@@ -15838,56 +16542,46 @@
  
  #undef $ac_func
  
@@ -37401,7 +38095,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    eval "$as_ac_var=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -15697,11 +16385,13 @@
+@@ -15895,11 +16589,13 @@
  
  eval "$as_ac_var=no"
  fi
@@ -37418,7 +38112,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -15716,18 +16406,19 @@
+@@ -15914,18 +16610,19 @@
  for ac_header in linux/version.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37446,7 +38140,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -15738,27 +16429,22 @@
+@@ -15936,27 +16633,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37485,7 +38179,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -15766,13 +16452,14 @@
+@@ -15964,13 +16656,14 @@
  
  ac_header_compiler=no
  fi
@@ -37505,7 +38199,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -15781,24 +16468,22 @@
+@@ -15979,24 +16672,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -37541,7 +38235,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -15806,9 +16491,10 @@
+@@ -16004,9 +16695,10 @@
  
    ac_header_preproc=no
  fi
@@ -37554,7 +38248,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -15832,25 +16518,24 @@
+@@ -16030,25 +16722,24 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -37588,7 +38282,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -15863,8 +16548,8 @@
+@@ -16061,8 +16752,8 @@
  done
  
  
@@ -37599,7 +38293,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_type_spinlock_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15876,39 +16561,35 @@
+@@ -16074,39 +16765,35 @@
  /* end confdefs.h.  */
  #include <linux/spinlock.h>
  
@@ -37653,7 +38347,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_cv_type_spinlock_t=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -15916,10 +16597,11 @@
+@@ -16114,10 +16801,11 @@
  
  ac_cv_type_spinlock_t=no
  fi
@@ -37668,7 +38362,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test $ac_cv_type_spinlock_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -15934,9 +16616,9 @@
+@@ -16132,9 +16820,9 @@
  for ac_func in strnlen
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -37681,7 +38375,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -15962,56 +16644,46 @@
+@@ -16160,56 +16848,46 @@
  
  #undef $ac_func
  
@@ -37755,7 +38449,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    eval "$as_ac_var=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -16019,11 +16691,13 @@
+@@ -16217,11 +16895,13 @@
  
  eval "$as_ac_var=no"
  fi
@@ -37772,7 +38466,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -16040,24 +16714,24 @@
+@@ -16238,24 +16918,24 @@
  #
  # Build with readline
  #
@@ -37807,7 +38501,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_lib_readline_readline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16070,43 +16744,39 @@
+@@ -16268,43 +16948,39 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37867,7 +38561,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_cv_lib_readline_readline=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -16114,12 +16784,13 @@
+@@ -16312,12 +16988,13 @@
  
  ac_cv_lib_readline_readline=no
  fi
@@ -37884,7 +38578,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test $ac_cv_lib_readline_readline = yes; then
  
  	LIBREADLINE="-lreadline -lncurses"
-@@ -16141,17 +16812,17 @@
+@@ -16339,17 +17016,17 @@
  fi
  
  
@@ -37910,7 +38604,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "$enable_efence" = "yes" ; then
  	LIBEFENCE="-lefence"
  
-@@ -16165,12 +16836,11 @@
+@@ -16363,12 +17040,11 @@
  
  
  # -------- enable acceptor libwrap (TCP wrappers) support? -------
@@ -37927,7 +38621,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		yes) enable_libwrap=yes ;;
  		no) enable_libwrap=no ;;
  		*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-libwrap" >&5
-@@ -16179,9 +16849,10 @@
+@@ -16377,9 +17053,10 @@
  	esac
  else
    enable_libwrap=no
@@ -37941,7 +38635,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_libwrap = xyes ; then
  	LIBWRAP="-lwrap"
  
-@@ -16195,18 +16866,18 @@
+@@ -16393,18 +17070,18 @@
  
  
  # -------- check for -lpthread support ----
@@ -37968,7 +38662,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16219,43 +16890,39 @@
+@@ -16417,43 +17094,39 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -38028,7 +38722,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_cv_lib_pthread_pthread_create=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -16263,12 +16930,13 @@
+@@ -16461,12 +17134,13 @@
  
  ac_cv_lib_pthread_pthread_create=no
  fi
@@ -38045,7 +38739,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test $ac_cv_lib_pthread_pthread_create = yes; then
    ENABLE_LIBPTHREAD="yes"
  else
-@@ -16276,8 +16944,8 @@
+@@ -16474,8 +17148,8 @@
  fi
  
  	if test "$ENABLE_LIBPTHREAD" = "yes" ; then
@@ -38056,7 +38750,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		PTHREAD_LIBS="-lpthread"
  
  cat >>confdefs.h <<\_ACEOF
-@@ -16286,13 +16954,13 @@
+@@ -16484,13 +17158,13 @@
  
  	else
  		PTHREAD_LIBS=""
@@ -38074,7 +38768,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	ENABLE_LIBPTHREAD="no"
  fi
  
-@@ -16300,17 +16968,17 @@
+@@ -16498,17 +17172,17 @@
  # ----------------------------------------
  # some tests for catamount-like systems
  # ----------------------------------------
@@ -38100,7 +38794,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_sysio_init != xno ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -16319,17 +16987,17 @@
+@@ -16517,17 +17191,17 @@
  
  fi
  
@@ -38126,7 +38820,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_urandom != xno ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -16340,8 +17008,8 @@
+@@ -16538,8 +17212,8 @@
  
  # -------- check for -lcap support ----
  if test x$enable_liblustre = xyes ; then
@@ -38137,7 +38831,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_lib_cap_cap_get_proc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16354,43 +17022,39 @@
+@@ -16552,43 +17226,39 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -38197,7 +38891,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_cv_lib_cap_cap_get_proc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -16398,12 +17062,13 @@
+@@ -16596,12 +17266,13 @@
  
  ac_cv_lib_cap_cap_get_proc=no
  fi
@@ -38214,7 +38908,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test $ac_cv_lib_cap_cap_get_proc = yes; then
  
  			CAP_LIBS="-lcap"
-@@ -16423,25 +17088,25 @@
+@@ -16621,25 +17292,25 @@
  
  fi
  
@@ -38250,7 +38944,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<_ACEOF
  #define LNET_MAX_PAYLOAD $LNET_MAX_PAYLOAD
-@@ -16450,13 +17115,12 @@
+@@ -16648,13 +17319,12 @@
  
  
  if test -z "$ENABLEPORTALS"; then
@@ -38268,7 +38962,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		case $with_portals in
  			no)     ENABLEPORTALS=0
  				;;
-@@ -16469,85 +17133,86 @@
+@@ -16667,85 +17337,86 @@
  
  		ENABLEPORTALS=0
  
@@ -38388,7 +39082,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<_ACEOF
  #define OBD_MAX_IOCTL_BUFFER $OBD_BUFFER_SIZE
-@@ -16568,18 +17233,19 @@
+@@ -16766,18 +17437,19 @@
  for ac_header in asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38416,7 +39110,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16590,27 +17256,22 @@
+@@ -16788,27 +17460,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38455,7 +39149,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -16618,13 +17279,14 @@
+@@ -16816,13 +17483,14 @@
  
  ac_header_compiler=no
  fi
@@ -38475,7 +39169,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16633,24 +17295,22 @@
+@@ -16831,24 +17499,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -38511,7 +39205,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -16658,9 +17318,10 @@
+@@ -16856,9 +17522,10 @@
  
    ac_header_preproc=no
  fi
@@ -38524,7 +39218,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16684,25 +17345,24 @@
+@@ -16882,25 +17549,24 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -38558,7 +39252,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -16721,18 +17381,19 @@
+@@ -16919,18 +17585,19 @@
  for ac_header in xtio.h file.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38586,7 +39280,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16743,27 +17404,22 @@
+@@ -16941,27 +17608,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38625,7 +39319,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -16771,13 +17427,14 @@
+@@ -16969,13 +17631,14 @@
  
  ac_header_compiler=no
  fi
@@ -38645,7 +39339,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16786,24 +17443,22 @@
+@@ -16984,24 +17647,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -38681,7 +39375,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -16811,9 +17466,10 @@
+@@ -17009,9 +17670,10 @@
  
    ac_header_preproc=no
  fi
@@ -38694,7 +39388,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16837,25 +17493,24 @@
+@@ -17035,25 +17697,24 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -38728,7 +39422,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -16876,18 +17531,19 @@
+@@ -17074,18 +17735,19 @@
  for ac_header in linux/types.h sys/types.h linux/unistd.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38756,7 +39450,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16898,27 +17554,22 @@
+@@ -17096,27 +17758,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38795,7 +39489,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -16926,13 +17577,14 @@
+@@ -17124,13 +17781,14 @@
  
  ac_header_compiler=no
  fi
@@ -38815,7 +39509,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16941,24 +17593,22 @@
+@@ -17139,24 +17797,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -38851,7 +39545,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -16966,9 +17616,10 @@
+@@ -17164,9 +17820,10 @@
  
    ac_header_preproc=no
  fi
@@ -38864,7 +39558,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16992,25 +17643,24 @@
+@@ -17190,25 +17847,24 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -38898,7 +39592,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -17030,18 +17680,19 @@
+@@ -17228,18 +17884,19 @@
  for ac_header in netinet/in.h arpa/inet.h catamount/data.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38926,7 +39620,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17052,27 +17703,22 @@
+@@ -17250,27 +17907,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38965,7 +39659,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -17080,13 +17726,14 @@
+@@ -17278,13 +17930,14 @@
  
  ac_header_compiler=no
  fi
@@ -38985,7 +39679,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17095,24 +17742,22 @@
+@@ -17293,24 +17946,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -39021,7 +39715,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -17120,9 +17765,10 @@
+@@ -17318,9 +17969,10 @@
  
    ac_header_preproc=no
  fi
@@ -39034,7 +39728,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -17146,25 +17792,24 @@
+@@ -17344,25 +17996,24 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -39068,7 +39762,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -17180,9 +17825,9 @@
+@@ -17378,9 +18029,9 @@
  for ac_func in inet_ntoa
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -39081,7 +39775,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -17208,56 +17853,46 @@
+@@ -17406,56 +18057,46 @@
  
  #undef $ac_func
  
@@ -39155,7 +39849,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    eval "$as_ac_var=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -17265,11 +17900,13 @@
+@@ -17463,11 +18104,13 @@
  
  eval "$as_ac_var=no"
  fi
@@ -39172,7 +39866,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -17280,8 +17917,8 @@
+@@ -17478,8 +18121,8 @@
  
  
  # libsysio/src/readlink.c
@@ -39183,7 +39877,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17302,30 +17939,25 @@
+@@ -17500,30 +18143,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -39227,7 +39921,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_POSIX_1003_READLINK 1
-@@ -17337,11 +17969,12 @@
+@@ -17535,11 +18173,12 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -39243,7 +39937,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  # lvfs/prng.c - depends on linux/types.h from liblustre/dir.c
-@@ -17349,9 +17982,9 @@
+@@ -17547,9 +18186,9 @@
  for ac_header in linux/random.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39256,7 +39950,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -17368,27 +18001,22 @@
+@@ -17566,27 +18205,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -39295,7 +39989,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    eval "$as_ac_Header=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -17396,10 +18024,12 @@
+@@ -17594,10 +18228,12 @@
  
  eval "$as_ac_Header=no"
  fi
@@ -39311,7 +40005,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -17415,18 +18045,19 @@
+@@ -17613,18 +18249,19 @@
  for ac_header in ext2fs/ext2fs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39339,7 +40033,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17437,27 +18068,22 @@
+@@ -17635,27 +18272,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -39378,7 +40072,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -17465,13 +18091,14 @@
+@@ -17663,13 +18295,14 @@
  
  ac_header_compiler=no
  fi
@@ -39398,7 +40092,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17480,24 +18107,22 @@
+@@ -17678,24 +18311,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -39434,7 +40128,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -17505,9 +18130,10 @@
+@@ -17703,9 +18334,10 @@
  
    ac_header_preproc=no
  fi
@@ -39447,7 +40141,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -17531,25 +18157,24 @@
+@@ -17729,25 +18361,24 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -39481,7 +40175,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -17564,8 +18189,8 @@
+@@ -17762,8 +18393,8 @@
  
  # check for -lz support
  ZLIB=""
@@ -39492,7 +40186,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_lib_z_adler32+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -17578,43 +18203,39 @@
+@@ -17776,43 +18407,39 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39552,7 +40246,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_cv_lib_z_adler32=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -17622,29 +18243,31 @@
+@@ -17820,29 +18447,31 @@
  
  ac_cv_lib_z_adler32=no
  fi
@@ -39595,7 +40289,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17655,27 +18278,22 @@
+@@ -17853,27 +18482,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -39634,7 +40328,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -17683,13 +18301,14 @@
+@@ -17881,13 +18505,14 @@
  
  ac_header_compiler=no
  fi
@@ -39654,7 +40348,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17698,24 +18317,22 @@
+@@ -17896,24 +18521,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -39690,7 +40384,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -17723,9 +18340,10 @@
+@@ -17921,9 +18544,10 @@
  
    ac_header_preproc=no
  fi
@@ -39703,7 +40397,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -17749,25 +18367,24 @@
+@@ -17947,25 +18571,24 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -39737,7 +40431,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -17798,11 +18415,11 @@
+@@ -17996,11 +18619,11 @@
  
  
  # Super safe df
@@ -39752,7 +40446,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "$enable_mindf" = "yes" ;  then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -17811,17 +18428,17 @@
+@@ -18009,17 +18632,17 @@
  
  fi
  
@@ -39778,7 +40472,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test x$enable_fail_alloc != xno ; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -17833,23 +18450,23 @@
+@@ -18031,23 +18654,23 @@
  
  
  if test "$SNMP_DIST_SUBDIR" ; then
@@ -39812,7 +40506,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_prog_NET_SNMP_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -17862,25 +18479,27 @@
+@@ -18060,25 +18683,27 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -39845,7 +40539,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  	if test "$NET_SNMP_CONFIG" ; then
  		NET_SNMP_CFLAGS=$($NET_SNMP_CONFIG --base-cflags)
  		NET_SNMP_LIBS=$($NET_SNMP_CONFIG --agent-libs)
-@@ -17892,17 +18511,17 @@
+@@ -18090,17 +18715,17 @@
  		LIBS="$LIBS $NET_SNMP_LIBS"
  
  		if test "${ac_cv_header_net_snmp_net_snmp_config_h+set}" = set; then
@@ -39869,7 +40563,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17913,27 +18532,22 @@
+@@ -18111,27 +18736,22 @@
  #include <net-snmp/net-snmp-config.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -39908,7 +40602,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -17941,13 +18555,14 @@
+@@ -18139,13 +18759,14 @@
  
  ac_header_compiler=no
  fi
@@ -39928,7 +40622,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17956,24 +18571,22 @@
+@@ -18154,24 +18775,22 @@
  /* end confdefs.h.  */
  #include <net-snmp/net-snmp-config.h>
  _ACEOF
@@ -39964,7 +40658,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -17981,9 +18594,10 @@
+@@ -18179,9 +18798,10 @@
  
    ac_header_preproc=no
  fi
@@ -39977,7 +40671,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -18007,31 +18621,29 @@
+@@ -18205,31 +18825,29 @@
  echo "$as_me: WARNING: net-snmp/net-snmp-config.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: net-snmp/net-snmp-config.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: net-snmp/net-snmp-config.h: in the future, the compiler will take precedence" >&2;}
@@ -40017,7 +40711,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_func_register_mib+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18058,56 +18670,46 @@
+@@ -18256,56 +18874,46 @@
  
  #undef register_mib
  
@@ -40091,7 +40785,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_cv_func_register_mib=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -18115,11 +18717,12 @@
+@@ -18313,11 +18921,12 @@
  
  ac_cv_func_register_mib=no
  fi
@@ -40107,7 +40801,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test $ac_cv_func_register_mib = yes; then
    SNMP_SUBDIR="snmp"
  else
-@@ -18128,8 +18731,8 @@
+@@ -18326,8 +18935,8 @@
  				NET_SNMP_LISB="$NET_SNMP_LIBS -lwrap"
  				# fail autoconf's cache
  				unset ac_cv_func_register_mib
@@ -40118,7 +40812,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test "${ac_cv_func_register_mib+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18156,56 +18759,46 @@
+@@ -18354,56 +18963,46 @@
  
  #undef register_mib
  
@@ -40192,7 +40886,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    ac_cv_func_register_mib=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -18213,11 +18806,12 @@
+@@ -18411,11 +19010,12 @@
  
  ac_cv_func_register_mib=no
  fi
@@ -40208,7 +40902,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  if test $ac_cv_func_register_mib = yes; then
    SNMP_SUBDIR="snmp"
  fi
-@@ -18233,14 +18827,14 @@
+@@ -18431,14 +19031,14 @@
  		LIBS="$LIBS_save"
  		CPPFLAGS="$CPPFLAGS_save"
  	fi
@@ -40229,7 +40923,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  		if test x$enable_snmp = xyes ; then
  			{ { echo "$as_me:$LINENO: error: SNMP support was requested, but unavailable" >&5
  echo "$as_me: error: SNMP support was requested, but unavailable" >&2;}
-@@ -18373,8 +18967,7 @@
+@@ -18571,8 +19171,7 @@
  fi
  
  
@@ -40239,7 +40933,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  
  
-@@ -18660,39 +19253,58 @@
+@@ -18858,39 +19457,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -40312,7 +41006,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    fi
  fi
  rm -f confcache
-@@ -18701,32 +19313,18 @@
+@@ -18899,32 +19517,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -40351,7 +41045,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  done
  LIBOBJS=$ac_libobjs
  
-@@ -19030,73 +19628,26 @@
+@@ -19235,73 +19839,26 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
@@ -40432,7 +41126,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -19117,14 +19668,24 @@
+@@ -19322,14 +19879,24 @@
    rm -f conf$$.sh
  fi
  
@@ -40464,7 +41158,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    case $0 in
      *[\\/]* ) as_myself=$0 ;;
      *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -19134,6 +19695,7 @@
+@@ -19339,6 +19906,7 @@
    test -z "$as_dir" && as_dir=.
    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  done
@@ -40472,7 +41166,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
         ;;
    esac
-@@ -19143,100 +19705,161 @@
+@@ -19348,100 +19916,161 @@
      as_myself=$0
    fi
    if test ! -f "$as_myself"; then
@@ -40689,7 +41383,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -19245,7 +19868,28 @@
+@@ -19450,7 +20079,28 @@
    as_mkdir_p=false
  fi
  
@@ -40719,7 +41413,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -19254,31 +19898,14 @@
+@@ -19459,31 +20109,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -40749,13 +41443,13 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 -
 +# values after options handling.
 +ac_log="
- This file was extended by Lustre $as_me 1.8.1, which was
+ This file was extended by Lustre $as_me 1.8.2, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -19286,30 +19913,20 @@
+@@ -19491,30 +20124,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -40794,7 +41488,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -19317,7 +19934,7 @@
+@@ -19522,7 +20145,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -40803,7 +41497,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -19336,19 +19953,21 @@
+@@ -19541,19 +20164,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -40812,7 +41506,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +_ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
- Lustre config.status 1.8.1
+ Lustre config.status 1.8.2
 -configured by $0, generated by GNU Autoconf 2.59,
 -  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 +configured by $0, generated by GNU Autoconf 2.61,
@@ -40831,7 +41525,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -19359,39 +19978,24 @@
+@@ -19564,39 +20189,24 @@
  do
    case $1 in
    --*=*)
@@ -40877,7 +41571,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -19401,18 +20005,24 @@
+@@ -19606,18 +20216,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -40907,7 +41601,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
    esac
    shift
-@@ -19428,28 +20038,40 @@
+@@ -19633,28 +20249,40 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -40956,7 +41650,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    "autoMakefile" ) CONFIG_FILES="$CONFIG_FILES autoMakefile" ;;
    "Rules" ) CONFIG_FILES="$CONFIG_FILES Rules:build/Rules.in" ;;
-@@ -19565,14 +20187,14 @@
+@@ -19771,14 +20399,14 @@
    "lustre/obdclass/darwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/obdclass/darwin/Makefile" ;;
    "snmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES snmp/Makefile" ;;
    "snmp/autoconf/Makefile" ) CONFIG_FILES="$CONFIG_FILES snmp/autoconf/Makefile" ;;
@@ -40973,7 +41667,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -19584,508 +20206,650 @@
+@@ -19790,511 +20418,653 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -41184,9 +41878,10 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 -s, at macosdir@,$macosdir,;t t
 -s, at DMU_SRC@,$DMU_SRC,;t t
 -s, at subdirs@,$subdirs,;t t
+-s, at SPL_SUBDIR@,$SPL_SUBDIR,;t t
+-s, at ZFS_SUBDIR@,$ZFS_SUBDIR,;t t
 -s, at SPL_DIR@,$SPL_DIR,;t t
 -s, at ZFS_DIR@,$ZFS_DIR,;t t
--s, at spl_src@,$spl_src,;t t
 -s, at DMU_OSD_ENABLED_TRUE@,$DMU_OSD_ENABLED_TRUE,;t t
 -s, at DMU_OSD_ENABLED_FALSE@,$DMU_OSD_ENABLED_FALSE,;t t
 -s, at KDMU_TRUE@,$KDMU_TRUE,;t t
@@ -41195,6 +41890,8 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 -s, at SNMP_SUBDIR@,$SNMP_SUBDIR,;t t
 -s, at LDISKFS_DIR@,$LDISKFS_DIR,;t t
 -s, at LDISKFS_SUBDIR@,$LDISKFS_SUBDIR,;t t
+-s, at LDISKFS_IN_KERNEL_TRUE@,$LDISKFS_IN_KERNEL_TRUE,;t t
+-s, at LDISKFS_IN_KERNEL_FALSE@,$LDISKFS_IN_KERNEL_FALSE,;t t
 -s, at LUSTREIOKIT_SUBDIR@,$LUSTREIOKIT_SUBDIR,;t t
 -s, at MPICC_WRAPPER@,$MPICC_WRAPPER,;t t
 -s, at LIBREADLINE@,$LIBREADLINE,;t t
@@ -41513,9 +42210,10 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +BACKINGFS!$BACKINGFS$ac_delim
 +DMU_SRC!$DMU_SRC$ac_delim
 +subdirs!$subdirs$ac_delim
++SPL_SUBDIR!$SPL_SUBDIR$ac_delim
++ZFS_SUBDIR!$ZFS_SUBDIR$ac_delim
 +SPL_DIR!$SPL_DIR$ac_delim
 +ZFS_DIR!$ZFS_DIR$ac_delim
-+spl_src!$spl_src$ac_delim
 +DMU_OSD_ENABLED_TRUE!$DMU_OSD_ENABLED_TRUE$ac_delim
 +DMU_OSD_ENABLED_FALSE!$DMU_OSD_ENABLED_FALSE$ac_delim
 +KDMU_TRUE!$KDMU_TRUE$ac_delim
@@ -41524,6 +42222,8 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +SNMP_SUBDIR!$SNMP_SUBDIR$ac_delim
 +LDISKFS_DIR!$LDISKFS_DIR$ac_delim
 +LDISKFS_SUBDIR!$LDISKFS_SUBDIR$ac_delim
++LDISKFS_IN_KERNEL_TRUE!$LDISKFS_IN_KERNEL_TRUE$ac_delim
++LDISKFS_IN_KERNEL_FALSE!$LDISKFS_IN_KERNEL_FALSE$ac_delim
 +LUSTREIOKIT_SUBDIR!$LUSTREIOKIT_SUBDIR$ac_delim
 +MPICC_WRAPPER!$MPICC_WRAPPER$ac_delim
 +LIBREADLINE!$LIBREADLINE$ac_delim
@@ -41547,9 +42247,6 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +TESTS_TRUE!$TESTS_TRUE$ac_delim
 +TESTS_FALSE!$TESTS_FALSE$ac_delim
 +DOC_TRUE!$DOC_TRUE$ac_delim
-+DOC_FALSE!$DOC_FALSE$ac_delim
-+INIT_SCRIPTS_TRUE!$INIT_SCRIPTS_TRUE$ac_delim
-+INIT_SCRIPTS_FALSE!$INIT_SCRIPTS_FALSE$ac_delim
 +_ACEOF
 +
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -41595,6 +42292,9 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  cat >conf$$subs.sed <<_ACEOF
++DOC_FALSE!$DOC_FALSE$ac_delim
++INIT_SCRIPTS_TRUE!$INIT_SCRIPTS_TRUE$ac_delim
++INIT_SCRIPTS_FALSE!$INIT_SCRIPTS_FALSE$ac_delim
 +LINUX_TRUE!$LINUX_TRUE$ac_delim
 +LINUX_FALSE!$LINUX_FALSE$ac_delim
 +DARWIN_TRUE!$DARWIN_TRUE$ac_delim
@@ -41657,7 +42357,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +LTLIBOBJS!$LTLIBOBJS$ac_delim
 +_ACEOF
 +
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -41680,7 +42380,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +cat >>$CONFIG_STATUS <<_ACEOF
 +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
+ _ACEOF
 +sed '
 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
 +s/^/s,@/; s/!/@,|#_!!_#|/
@@ -41695,7 +42395,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
 +:end
 +s/|#_!!_#|//g
 +CEOF$ac_eof
- _ACEOF
++_ACEOF
 +
 +
 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -42058,7 +42758,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -20093,248 +20857,130 @@
+@@ -20302,248 +21072,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -42404,7 +43104,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -20345,135 +20991,39 @@
+@@ -20554,135 +21206,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -42564,7 +43264,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -20483,17 +21033,28 @@
+@@ -20692,17 +21248,28 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -42600,7 +43300,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    	  s/.*/./; q'`
    else
      continue
-@@ -20522,53 +21083,79 @@
+@@ -20731,53 +21298,79 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -42707,7 +43407,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
  
  { (exit 0); exit 0; }
  _ACEOF
-@@ -20605,7 +21192,10 @@
+@@ -20814,7 +21407,10 @@
    # Remove --cache-file and --srcdir arguments so they do not pile up.
    ac_sub_configure_args=
    ac_prev=
@@ -42719,7 +43419,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      if test -n "$ac_prev"; then
        ac_prev=
        continue
-@@ -20628,123 +21218,123 @@
+@@ -20837,123 +21433,123 @@
        ac_prev=prefix ;;
      -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
        ;;
@@ -42928,7 +43628,7 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
      else
        { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
  echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-@@ -20756,21 +21346,21 @@
+@@ -20965,21 +21561,21 @@
        # Make the cache file name correct relative to the subdirectory.
        case $cache_file in
        [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
@@ -42957,10 +43657,169 @@ diff -Nurwd lustre-1.8.1.orig/configure lustre-1.8.1/configure
    done
  fi
  
-diff -Nurwd lustre-1.8.1.orig/ldiskfs/aclocal.m4 lustre-1.8.1/ldiskfs/aclocal.m4
---- lustre-1.8.1.orig/ldiskfs/aclocal.m4	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/ldiskfs/aclocal.m4	2009-09-10 11:17:13.000000000 +0200
-@@ -2368,110 +2368,3 @@
+diff -Nurwd orig/lustre-1.8.2/configure.ac lustre-1.8.2/configure.ac
+--- orig/lustre-1.8.2/configure.ac	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/configure.ac	2010-03-03 15:57:14.899633653 +0000
+@@ -8,6 +8,7 @@
+ LB_CHECK_VERSION
+ 
+ LC_CONFIG_SRCDIR
++LC_CONFIG_QUOTA
+ 
+ AC_CANONICAL_SYSTEM
+ 
+diff -Nurwd orig/lustre-1.8.2/debian/patched/autogen.sh.dpatch lustre-1.8.2/debian/patched/autogen.sh.dpatch
+--- orig/lustre-1.8.2/debian/patched/autogen.sh.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/autogen.sh.dpatch	2010-03-03 15:57:14.819658335 +0000
+@@ -0,0 +1,5 @@
++patching file autogen.sh
++patching file build/autogen.sh
++patching file ldiskfs/autogen.sh
++patching file ldiskfs/build/autogen.sh
++patching file libsysio/autogen.sh
+diff -Nurwd orig/lustre-1.8.2/debian/patched/bash_completion.dpatch lustre-1.8.2/debian/patched/bash_completion.dpatch
+--- orig/lustre-1.8.2/debian/patched/bash_completion.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/bash_completion.dpatch	2010-03-03 15:57:14.847642479 +0000
+@@ -0,0 +1,2 @@
++patching file lustre/contrib/bash_completion/lctl
++patching file lustre/contrib/bash_completion/lfs
+diff -Nurwd orig/lustre-1.8.2/debian/patched/bug12769-ql-fix.dpatch lustre-1.8.2/debian/patched/bug12769-ql-fix.dpatch
+--- orig/lustre-1.8.2/debian/patched/bug12769-ql-fix.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/bug12769-ql-fix.dpatch	2010-03-03 15:57:14.843633798 +0000
+@@ -0,0 +1,2 @@
++patching file lustre/llite/file.c
++Hunk #1 succeeded at 276 with fuzz 1 (offset -5 lines).
+diff -Nurwd orig/lustre-1.8.2/debian/patched/bug13852-quota_includes.dpatch lustre-1.8.2/debian/patched/bug13852-quota_includes.dpatch
+--- orig/lustre-1.8.2/debian/patched/bug13852-quota_includes.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/bug13852-quota_includes.dpatch	2010-03-03 15:57:14.887656712 +0000
+@@ -0,0 +1,2 @@
++patching file lustre/include/liblustre.h
++Hunk #1 succeeded at 67 (offset 17 lines).
+diff -Nurwd orig/lustre-1.8.2/debian/patched/enable-quota.dpatch lustre-1.8.2/debian/patched/enable-quota.dpatch
+--- orig/lustre-1.8.2/debian/patched/enable-quota.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/enable-quota.dpatch	2010-03-03 15:57:14.903643171 +0000
+@@ -0,0 +1,3 @@
++patching file configure.ac
++patching file lustre/autoconf/lustre-core.m4
++Hunk #1 succeeded at 2066 (offset 253 lines).
+diff -Nurwd orig/lustre-1.8.2/debian/patched/fix-2.6.15-versioncheck.dpatch lustre-1.8.2/debian/patched/fix-2.6.15-versioncheck.dpatch
+--- orig/lustre-1.8.2/debian/patched/fix-2.6.15-versioncheck.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/fix-2.6.15-versioncheck.dpatch	2010-03-03 15:57:14.879657721 +0000
+@@ -0,0 +1,2 @@
++patching file lustre/include/linux/lustre_compat25.h
++Hunk #1 succeeded at 106 (offset 31 lines).
+diff -Nurwd orig/lustre-1.8.2/debian/patched/fix-lustre-manpage.dpatch lustre-1.8.2/debian/patched/fix-lustre-manpage.dpatch
+--- orig/lustre-1.8.2/debian/patched/fix-lustre-manpage.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/fix-lustre-manpage.dpatch	2010-03-03 15:57:14.895661151 +0000
+@@ -0,0 +1,3 @@
++patching file lustre/doc/lctl.8
++patching file lustre/doc/lustre.7
++Hunk #1 succeeded at 2 with fuzz 1.
+diff -Nurwd orig/lustre-1.8.2/debian/patched/fix-oot-builds.dpatch lustre-1.8.2/debian/patched/fix-oot-builds.dpatch
+--- orig/lustre-1.8.2/debian/patched/fix-oot-builds.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/fix-oot-builds.dpatch	2010-03-03 15:57:14.923634049 +0000
+@@ -0,0 +1,3 @@
++patching file build/autoconf/lustre-build.m4
++patching file lustre/autoMakefile.am
++patching file lustre/scripts/version_tag.pl
+diff -Nurwd orig/lustre-1.8.2/debian/patched/fix-symlink-attack.dpatch lustre-1.8.2/debian/patched/fix-symlink-attack.dpatch
+--- orig/lustre-1.8.2/debian/patched/fix-symlink-attack.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/fix-symlink-attack.dpatch	2010-03-03 15:57:14.907633482 +0000
+@@ -0,0 +1 @@
++patching file lustre/tests/runiozone
+diff -Nurwd orig/lustre-1.8.2/debian/patched/inode-no-i_blksize-2.6.20.dpatch lustre-1.8.2/debian/patched/inode-no-i_blksize-2.6.20.dpatch
+--- orig/lustre-1.8.2/debian/patched/inode-no-i_blksize-2.6.20.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/inode-no-i_blksize-2.6.20.dpatch	2010-03-03 15:57:14.787634151 +0000
+@@ -0,0 +1,3 @@
++patching file lustre/mds/handler.c
++Hunk #1 succeeded at 1206 with fuzz 1 (offset 15 lines).
++Hunk #2 succeeded at 1235 (offset 11 lines).
+diff -Nurwd orig/lustre-1.8.2/debian/patched/ldiskfs-detect-2.6.20-2.6.22.dpatch lustre-1.8.2/debian/patched/ldiskfs-detect-2.6.20-2.6.22.dpatch
+--- orig/lustre-1.8.2/debian/patched/ldiskfs-detect-2.6.20-2.6.22.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/ldiskfs-detect-2.6.20-2.6.22.dpatch	2010-03-03 15:57:14.803634020 +0000
+@@ -0,0 +1,2 @@
++patching file ldiskfs/configure.ac
++Hunk #1 succeeded at 112 (offset -23 lines).
+diff -Nurwd orig/lustre-1.8.2/debian/patched/libsysio.dpatch lustre-1.8.2/debian/patched/libsysio.dpatch
+--- orig/lustre-1.8.2/debian/patched/libsysio.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/libsysio.dpatch	2010-03-03 15:57:14.835657366 +0000
+@@ -0,0 +1 @@
++patching file lustre/liblustre/Makefile.am
+diff -Nurwd orig/lustre-1.8.2/debian/patched/lustre_config.dpatch lustre-1.8.2/debian/patched/lustre_config.dpatch
+--- orig/lustre-1.8.2/debian/patched/lustre_config.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/lustre_config.dpatch	2010-03-03 15:57:14.871660545 +0000
+@@ -0,0 +1,12 @@
++patching file lustre/scripts/lc_cluman.in
++patching file lustre/scripts/lc_hb.in
++Hunk #1 succeeded at 34 (offset 3 lines).
++patching file lustre/scripts/lc_lvm.in
++patching file lustre/scripts/lc_md.in
++patching file lustre/scripts/lc_modprobe.in
++patching file lustre/scripts/lc_net.in
++Hunk #1 succeeded at 30 (offset 3 lines).
++patching file lustre/scripts/lustre_config.in
++Hunk #1 succeeded at 233 with fuzz 1 (offset 3 lines).
++patching file lustre/scripts/lustre_createcsv.in
++Hunk #1 succeeded at 39 (offset 2 lines).
+diff -Nurwd orig/lustre-1.8.2/debian/patched/lustre_manpage.dpatch lustre-1.8.2/debian/patched/lustre_manpage.dpatch
+--- orig/lustre-1.8.2/debian/patched/lustre_manpage.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/lustre_manpage.dpatch	2010-03-03 15:57:14.855654670 +0000
+@@ -0,0 +1,2 @@
++patching file lustre/doc/lustre.7
++Hunk #1 succeeded at 8 with fuzz 1.
+diff -Nurwd orig/lustre-1.8.2/debian/patched/no-darwin.dpatch lustre-1.8.2/debian/patched/no-darwin.dpatch
+--- orig/lustre-1.8.2/debian/patched/no-darwin.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/no-darwin.dpatch	2010-03-03 15:57:14.827661168 +0000
+@@ -0,0 +1,13 @@
++patching file autoMakefile.am
++patching file autoMakefile.am.~1~
++patching file lnet/include/libcfs/Makefile.am
++patching file lnet/include/lnet/Makefile.am
++patching file lnet/klnds/socklnd/autoMakefile.am
++patching file lnet/libcfs/autoMakefile.am
++patching file lnet/lnet/autoMakefile.am
++patching file lustre/lov/autoMakefile.am
++patching file lustre/lvfs/autoMakefile.am
++patching file lustre/obdclass/autoMakefile.am
++patching file lustre/obdecho/autoMakefile.am
++patching file lustre/osc/autoMakefile.am
++patching file lustre/ptlrpc/autoMakefile.am
+diff -Nurwd orig/lustre-1.8.2/debian/patched/no_default_debugging.dpatch lustre-1.8.2/debian/patched/no_default_debugging.dpatch
+--- orig/lustre-1.8.2/debian/patched/no_default_debugging.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/no_default_debugging.dpatch	2010-03-03 15:57:14.811633851 +0000
+@@ -0,0 +1,2 @@
++patching file lnet/libcfs/debug.c
++Hunk #1 succeeded at 52 (offset 18 lines).
+diff -Nurwd orig/lustre-1.8.2/debian/patched/page-size-undef-fixes.dpatch lustre-1.8.2/debian/patched/page-size-undef-fixes.dpatch
+--- orig/lustre-1.8.2/debian/patched/page-size-undef-fixes.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/page-size-undef-fixes.dpatch	2010-03-03 15:57:14.779634390 +0000
+@@ -0,0 +1,2 @@
++patching file lnet/include/libcfs/user-prim.h
++Hunk #1 succeeded at 139 with fuzz 2 (offset 34 lines).
+diff -Nurwd orig/lustre-1.8.2/debian/patched/posix_acl.dpatch lustre-1.8.2/debian/patched/posix_acl.dpatch
+--- orig/lustre-1.8.2/debian/patched/posix_acl.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/posix_acl.dpatch	2010-03-03 15:57:14.799633652 +0000
+@@ -0,0 +1,5 @@
++patching file lustre/llite/file.c
++patching file lustre/llite/xattr.c
++patching file lustre/mdc/mdc_locks.c
++patching file lustre/mdc/mdc_request.c
++patching file lustre/mds/handler.c
+diff -Nurwd orig/lustre-1.8.2/debian/patched/tex2pdf.dpatch lustre-1.8.2/debian/patched/tex2pdf.dpatch
+--- orig/lustre-1.8.2/debian/patched/tex2pdf.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/tex2pdf.dpatch	2010-03-03 15:57:14.863633966 +0000
+@@ -0,0 +1 @@
++patching file lustre/doc/tex2pdf
+diff -Nurwd orig/lustre-1.8.2/debian/patched/use_bash_instead_of_sh.dpatch lustre-1.8.2/debian/patched/use_bash_instead_of_sh.dpatch
+--- orig/lustre-1.8.2/debian/patched/use_bash_instead_of_sh.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/debian/patched/use_bash_instead_of_sh.dpatch	2010-03-03 15:57:14.915634289 +0000
+@@ -0,0 +1,2 @@
++patching file lustre/tests/acl/make-tree
++patching file lustre/tests/insanity.sh
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/aclocal.m4 lustre-1.8.2/ldiskfs/aclocal.m4
+--- orig/lustre-1.8.2/ldiskfs/aclocal.m4	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/aclocal.m4	2010-03-03 16:00:17.804632196 +0000
+@@ -2420,110 +2420,3 @@
  AS_VAR_POPDEF([ac_Header])dnl
  ])
  
@@ -43071,10 +43930,82 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/aclocal.m4 lustre-1.8.1/ldiskfs/aclocal.m4
 -LC_PROG_DARWIN
 -])
 -
-diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldiskfs/autom4te.cache/output.0
---- lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/ldiskfs/autom4te.cache/output.0	2009-09-10 11:17:16.000000000 +0200
-@@ -0,0 +1,7676 @@
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/autoMakefile.in lustre-1.8.2/ldiskfs/autoMakefile.in
+--- orig/lustre-1.8.2/ldiskfs/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/autoMakefile.in	2010-03-03 16:00:18.763633267 +0000
+@@ -68,6 +68,7 @@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
++GREP = @GREP@
+ INCLUDE_RULES = @INCLUDE_RULES@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -121,8 +122,6 @@
+ VERSION = @VERSION@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__include = @am__include@
+@@ -135,12 +134,16 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+@@ -148,14 +151,17 @@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -208,8 +214,8 @@
+ DIST_COMMON = $(srcdir)/autoMakefile.in \
+ 	$(srcdir)/build/autoMakefile.am.toplevel $(srcdir)/configure \
+ 	COPYING ChangeLog Makefile.in aclocal.m4 autoMakefile.am \
+-	config.guess config.h.in config.sub configure.ac install-sh \
+-	lustre-ldiskfs.spec.in missing mkinstalldirs
++	config.guess config.h.in config.sub configure configure.ac \
++	install-sh lustre-ldiskfs.spec.in missing mkinstalldirs
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/autogen.sh lustre-1.8.2/ldiskfs/autogen.sh
+--- orig/lustre-1.8.2/ldiskfs/autogen.sh	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/autogen.sh	2010-03-03 15:57:14.815634149 +0000
+@@ -0,0 +1,2 @@
++#!/bin/bash
++exec bash build/autogen.sh $@ 
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/autom4te.cache/output.0 lustre-1.8.2/ldiskfs/autom4te.cache/output.0
+--- orig/lustre-1.8.2/ldiskfs/autom4te.cache/output.0	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/autom4te.cache/output.0	2010-03-03 16:00:18.360632890 +0000
+@@ -0,0 +1,7643 @@
 +@%:@! /bin/sh
 +@%:@ Guess values for system-dependent variables and create Makefiles.
 +@%:@ Generated by GNU Autoconf 2.61 for Lustre ldiskfs 3.0.9.
@@ -44416,7 +45347,6 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +  --enable-dependency-tracking  Do not reject slow dependency extractors
 +  --disable-modules       disable building of Lustre kernel modules
 +  --disable-quilt         disable use of quilt for ldiskfs
-+  --enable-ext4           enable building of ldiskfs based on ext4
 +
 +Optional Packages:
 +  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -47744,7 +48674,6 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +
 +
 +
-+
 +{ echo "$as_me:$LINENO: checking whether to build kernel modules" >&5
 +echo $ECHO_N "checking whether to build kernel modules... $ECHO_C" >&6; }
 +# Check whether --enable-modules was given.
@@ -48081,7 +49010,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d $makerule LUSTRE_KERNEL_TEST=conftest.i ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d $makerule LUSTRE_KERNEL_TEST=conftest.i ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -48120,7 +49049,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d $makerule LUSTRE_KERNEL_TEST=conftest.i ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d $makerule LUSTRE_KERNEL_TEST=conftest.i ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -48178,7 +49107,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -48244,7 +49173,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
 +if { ac_try='cp conftest.c build && make -d 
 +	$makerule LUSTRE_KERNEL_TEST=conftest.i
-+ ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++ ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -48329,7 +49258,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -48382,7 +49311,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -48466,7 +49395,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -48524,7 +49453,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -48578,7 +49507,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -48638,7 +49567,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +_ACEOF
 +
 +rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-+if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
++if { ac_try='cp conftest.c build && make -d modules ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -49036,39 +49965,8 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +@%:@define CONFIG_LDISKFSDEV_FS_SECURITY 1
 +_ACEOF
 +
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define CONFIG_LDISKFS_FS_NFS4ACL 1
-+_ACEOF
-+
-+
 +
 +
-+{ echo "$as_me:$LINENO: checking whether to build ldiskfs based on ext4" >&5
-+echo $ECHO_N "checking whether to build ldiskfs based on ext4... $ECHO_C" >&6; }
-+if test x$RHEL_KERNEL = xyes; then
-+	# Check whether --enable-ext4 was given.
-+if test "${enable_ext4+set}" = set; then
-+  enableval=$enable_ext4; 
-+else
-+  enable_ext4='no'
-+fi
-+
-+else
-+	case $LINUXRELEASE in
-+	# ext4 was in 2.6.22-2.6.26 but not stable enough to use
-+	2.6.206*) enable_ext4='no' ;;
-+	*) if test -f $LINUX/fs/ext4/ext4.h ; then
-+enable_ext4='yes'
-+else
-+enable_ext4='no'
-+fi
-+ ;;
-+	esac
-+fi
-+{ echo "$as_me:$LINENO: result: $enable_ext4" >&5
-+echo "${ECHO_T}$enable_ext4" >&6; }
-+
 +if test x$enable_ext4 = xyes ; then
 +	
 +cat >>confdefs.h <<\_ACEOF
@@ -50751,11 +51649,11 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/output.0 lustre-1.8.1/ldisk
 +  $ac_cs_success || { (exit 1); exit 1; }
 +fi
 +
-diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/requests lustre-1.8.1/ldiskfs/autom4te.cache/requests
---- lustre-1.8.1.orig/ldiskfs/autom4te.cache/requests	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/ldiskfs/autom4te.cache/requests	2009-09-10 11:17:21.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/autom4te.cache/requests lustre-1.8.2/ldiskfs/autom4te.cache/requests
+--- orig/lustre-1.8.2/ldiskfs/autom4te.cache/requests	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/autom4te.cache/requests	2010-03-03 16:00:19.084632645 +0000
 @@ -0,0 +1,64 @@
-+# This file was generated by Autom4te Wed Jan 17 19:57:31 PST 2007.
++# This file was generated by Autom4te Mon Aug 11 20:59:21 PDT 2008.
 +# It contains the lists of macros which have been traced.
 +# It can be safely removed.
 +
@@ -50819,10 +51717,10 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/requests lustre-1.8.1/ldisk
 +                    ], 'Autom4te::Request' )
 +           );
 +
-diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/traces.0 lustre-1.8.1/ldiskfs/autom4te.cache/traces.0
---- lustre-1.8.1.orig/ldiskfs/autom4te.cache/traces.0	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/ldiskfs/autom4te.cache/traces.0	2009-09-10 11:17:16.000000000 +0200
-@@ -0,0 +1,633 @@
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/autom4te.cache/traces.0 lustre-1.8.2/ldiskfs/autom4te.cache/traces.0
+--- orig/lustre-1.8.2/ldiskfs/autom4te.cache/traces.0	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/autom4te.cache/traces.0	2010-03-03 16:00:18.360632890 +0000
+@@ -0,0 +1,626 @@
 +m4trace:aclocal.m4:43: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
 +m4trace:configure.ac:3: -1- AC_INIT([Lustre ldiskfs], [3.0.9], [https://bugzilla.lustre.org/])
 +m4trace:configure.ac:3: -1- m4_pattern_forbid([^_?A[CHUM]_])
@@ -51213,319 +52111,378 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/autom4te.cache/traces.0 lustre-1.8.1/ldisk
 +m4trace:configure.ac:17: -1- AC_SUBST([EXTRA_KCFLAGS])
 +m4trace:configure.ac:17: -1- AC_SUBST_TRACE([EXTRA_KCFLAGS])
 +m4trace:configure.ac:17: -1- m4_pattern_allow([^EXTRA_KCFLAGS$])
++m4trace:configure.ac:39: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
++configure.ac:39: the top level])
 +m4trace:configure.ac:46: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
++aclocal.m4:1936: LB_LINUX_PATH is expanded from...
++aclocal.m4:2329: LB_PROG_LINUX is expanded from...
 +configure.ac:46: the top level])
-+m4trace:configure.ac:53: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:1884: LB_LINUX_PATH is expanded from...
-+aclocal.m4:2277: LB_PROG_LINUX is expanded from...
-+configure.ac:53: the top level])
-+m4trace:configure.ac:53: -1- AC_SUBST([LINUX])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([LINUX])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^LINUX$])
-+m4trace:configure.ac:53: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++m4trace:configure.ac:46: -1- AC_SUBST([LINUX])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LINUX])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^LINUX$])
++m4trace:configure.ac:46: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:1884: LB_LINUX_PATH is expanded from...
-+aclocal.m4:2277: LB_PROG_LINUX is expanded from...
-+configure.ac:53: the top level])
-+m4trace:configure.ac:53: -1- AC_SUBST([LINUX_OBJ])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([LINUX_OBJ])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^LINUX_OBJ$])
-+m4trace:configure.ac:53: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++aclocal.m4:1936: LB_LINUX_PATH is expanded from...
++aclocal.m4:2329: LB_PROG_LINUX is expanded from...
++configure.ac:46: the top level])
++m4trace:configure.ac:46: -1- AC_SUBST([LINUX_OBJ])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LINUX_OBJ])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^LINUX_OBJ$])
++m4trace:configure.ac:46: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 +../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from...
-+aclocal.m4:1884: LB_LINUX_PATH is expanded from...
-+aclocal.m4:2277: LB_PROG_LINUX is expanded from...
-+configure.ac:53: the top level])
-+m4trace:configure.ac:53: -1- AC_SUBST([LINUX_CONFIG])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([LINUX_CONFIG])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^LINUX_CONFIG$])
-+m4trace:configure.ac:53: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++aclocal.m4:1936: LB_LINUX_PATH is expanded from...
++aclocal.m4:2329: LB_PROG_LINUX is expanded from...
++configure.ac:46: the top level])
++m4trace:configure.ac:46: -1- AC_SUBST([LINUX_CONFIG])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LINUX_CONFIG])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^LINUX_CONFIG$])
++m4trace:configure.ac:46: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:1884: LB_LINUX_PATH is expanded from...
-+aclocal.m4:2277: LB_PROG_LINUX is expanded from...
-+configure.ac:53: the top level])
-+m4trace:configure.ac:53: -1- AC_SUBST([ARCH_UM])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([ARCH_UM])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^ARCH_UM$])
-+m4trace:configure.ac:53: -1- AC_SUBST([UML_CFLAGS])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([UML_CFLAGS])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^UML_CFLAGS$])
-+m4trace:configure.ac:53: -1- AC_SUBST([MODULE_TARGET])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([MODULE_TARGET])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^MODULE_TARGET$])
-+m4trace:configure.ac:53: -1- AC_SUBST([linux25])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([linux25])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^linux25$])
-+m4trace:configure.ac:53: -1- AC_SUBST([KMODEXT])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([KMODEXT])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^KMODEXT$])
-+m4trace:configure.ac:53: -1- AC_SUBST([LINUXRELEASE])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([LINUXRELEASE])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^LINUXRELEASE$])
-+m4trace:configure.ac:53: -1- AC_SUBST([moduledir])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([moduledir])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^moduledir$])
-+m4trace:configure.ac:53: -1- AC_SUBST([modulefsdir])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([modulefsdir])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^modulefsdir$])
-+m4trace:configure.ac:53: -1- AC_SUBST([modulenetdir])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([modulenetdir])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^modulenetdir$])
-+m4trace:configure.ac:53: -1- AC_SUBST([RELEASE])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([RELEASE])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^RELEASE$])
-+m4trace:configure.ac:53: -1- AC_SUBST([SYMVERFILE])
-+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([SYMVERFILE])
-+m4trace:configure.ac:53: -1- m4_pattern_allow([^SYMVERFILE$])
-+m4trace:configure.ac:53: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++aclocal.m4:1936: LB_LINUX_PATH is expanded from...
++aclocal.m4:2329: LB_PROG_LINUX is expanded from...
++configure.ac:46: the top level])
++m4trace:configure.ac:46: -1- AC_SUBST([ARCH_UM])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([ARCH_UM])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^ARCH_UM$])
++m4trace:configure.ac:46: -1- AC_SUBST([UML_CFLAGS])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([UML_CFLAGS])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^UML_CFLAGS$])
++m4trace:configure.ac:46: -1- AC_SUBST([MODULE_TARGET])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([MODULE_TARGET])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^MODULE_TARGET$])
++m4trace:configure.ac:46: -1- AC_SUBST([linux25])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([linux25])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^linux25$])
++m4trace:configure.ac:46: -1- AC_SUBST([KMODEXT])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([KMODEXT])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^KMODEXT$])
++m4trace:configure.ac:46: -1- AC_SUBST([LINUXRELEASE])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LINUXRELEASE])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^LINUXRELEASE$])
++m4trace:configure.ac:46: -1- AC_SUBST([moduledir])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([moduledir])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^moduledir$])
++m4trace:configure.ac:46: -1- AC_SUBST([modulefsdir])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([modulefsdir])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^modulefsdir$])
++m4trace:configure.ac:46: -1- AC_SUBST([modulenetdir])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([modulenetdir])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^modulenetdir$])
++m4trace:configure.ac:46: -1- AC_SUBST([RELEASE])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([RELEASE])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^RELEASE$])
++m4trace:configure.ac:46: -1- AC_SUBST([SYMVERFILE])
++m4trace:configure.ac:46: -1- AC_SUBST_TRACE([SYMVERFILE])
++m4trace:configure.ac:46: -1- m4_pattern_allow([^SYMVERFILE$])
++m4trace:configure.ac:46: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+aclocal.m4:2212: LB_CONFIG_OFED_BACKPORTS is expanded from...
-+aclocal.m4:2277: LB_PROG_LINUX is expanded from...
-+configure.ac:53: the top level])
-+m4trace:configure.ac:55: -1- AC_SUBST([MODPOST])
-+m4trace:configure.ac:55: -1- AC_SUBST_TRACE([MODPOST])
-+m4trace:configure.ac:55: -1- m4_pattern_allow([^MODPOST$])
-+m4trace:configure.ac:55: -1- AC_SUBST([MODPOST_ARGS])
-+m4trace:configure.ac:55: -1- AC_SUBST_TRACE([MODPOST_ARGS])
-+m4trace:configure.ac:55: -1- m4_pattern_allow([^MODPOST_ARGS$])
-+m4trace:configure.ac:59: -1- AC_CONFIG_HEADERS([config.h])
-+m4trace:configure.ac:59: -1- AC_SUBST([EXTRA_KCFLAGS])
-+m4trace:configure.ac:59: -1- AC_SUBST_TRACE([EXTRA_KCFLAGS])
-+m4trace:configure.ac:59: -1- m4_pattern_allow([^EXTRA_KCFLAGS$])
-+m4trace:configure.ac:62: -1- AM_CONDITIONAL([MODULES], [true])
-+m4trace:configure.ac:62: -1- AC_SUBST([MODULES_TRUE])
-+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([MODULES_TRUE])
-+m4trace:configure.ac:62: -1- m4_pattern_allow([^MODULES_TRUE$])
-+m4trace:configure.ac:62: -1- AC_SUBST([MODULES_FALSE])
-+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([MODULES_FALSE])
-+m4trace:configure.ac:62: -1- m4_pattern_allow([^MODULES_FALSE$])
-+m4trace:configure.ac:63: -1- AM_CONDITIONAL([LINUX], [true])
-+m4trace:configure.ac:63: -1- AC_SUBST([LINUX_TRUE])
-+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([LINUX_TRUE])
-+m4trace:configure.ac:63: -1- m4_pattern_allow([^LINUX_TRUE$])
-+m4trace:configure.ac:63: -1- AC_SUBST([LINUX_FALSE])
-+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([LINUX_FALSE])
-+m4trace:configure.ac:63: -1- m4_pattern_allow([^LINUX_FALSE$])
-+m4trace:configure.ac:64: -1- AM_CONDITIONAL([DARWIN], [true])
-+m4trace:configure.ac:64: -1- AC_SUBST([DARWIN_TRUE])
-+m4trace:configure.ac:64: -1- AC_SUBST_TRACE([DARWIN_TRUE])
-+m4trace:configure.ac:64: -1- m4_pattern_allow([^DARWIN_TRUE$])
-+m4trace:configure.ac:64: -1- AC_SUBST([DARWIN_FALSE])
-+m4trace:configure.ac:64: -1- AC_SUBST_TRACE([DARWIN_FALSE])
-+m4trace:configure.ac:64: -1- m4_pattern_allow([^DARWIN_FALSE$])
-+m4trace:configure.ac:65: -1- AM_CONDITIONAL([LINUX25], [true])
-+m4trace:configure.ac:65: -1- AC_SUBST([LINUX25_TRUE])
-+m4trace:configure.ac:65: -1- AC_SUBST_TRACE([LINUX25_TRUE])
-+m4trace:configure.ac:65: -1- m4_pattern_allow([^LINUX25_TRUE$])
-+m4trace:configure.ac:65: -1- AC_SUBST([LINUX25_FALSE])
-+m4trace:configure.ac:65: -1- AC_SUBST_TRACE([LINUX25_FALSE])
-+m4trace:configure.ac:65: -1- m4_pattern_allow([^LINUX25_FALSE$])
-+m4trace:configure.ac:68: -1- AC_SUBST([LDISKFSDIR])
-+m4trace:configure.ac:68: -1- AC_SUBST_TRACE([LDISKFSDIR])
-+m4trace:configure.ac:68: -1- m4_pattern_allow([^LDISKFSDIR$])
-+m4trace:configure.ac:72: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++aclocal.m4:2264: LB_CONFIG_OFED_BACKPORTS is expanded from...
++aclocal.m4:2329: LB_PROG_LINUX is expanded from...
++configure.ac:46: the top level])
++m4trace:configure.ac:48: -1- AC_SUBST([MODPOST])
++m4trace:configure.ac:48: -1- AC_SUBST_TRACE([MODPOST])
++m4trace:configure.ac:48: -1- m4_pattern_allow([^MODPOST$])
++m4trace:configure.ac:48: -1- AC_SUBST([MODPOST_ARGS])
++m4trace:configure.ac:48: -1- AC_SUBST_TRACE([MODPOST_ARGS])
++m4trace:configure.ac:48: -1- m4_pattern_allow([^MODPOST_ARGS$])
++m4trace:configure.ac:52: -1- AC_CONFIG_HEADERS([config.h])
++m4trace:configure.ac:52: -1- AC_SUBST([EXTRA_KCFLAGS])
++m4trace:configure.ac:52: -1- AC_SUBST_TRACE([EXTRA_KCFLAGS])
++m4trace:configure.ac:52: -1- m4_pattern_allow([^EXTRA_KCFLAGS$])
++m4trace:configure.ac:55: -1- AM_CONDITIONAL([MODULES], [true])
++m4trace:configure.ac:55: -1- AC_SUBST([MODULES_TRUE])
++m4trace:configure.ac:55: -1- AC_SUBST_TRACE([MODULES_TRUE])
++m4trace:configure.ac:55: -1- m4_pattern_allow([^MODULES_TRUE$])
++m4trace:configure.ac:55: -1- AC_SUBST([MODULES_FALSE])
++m4trace:configure.ac:55: -1- AC_SUBST_TRACE([MODULES_FALSE])
++m4trace:configure.ac:55: -1- m4_pattern_allow([^MODULES_FALSE$])
++m4trace:configure.ac:56: -1- AM_CONDITIONAL([LINUX], [true])
++m4trace:configure.ac:56: -1- AC_SUBST([LINUX_TRUE])
++m4trace:configure.ac:56: -1- AC_SUBST_TRACE([LINUX_TRUE])
++m4trace:configure.ac:56: -1- m4_pattern_allow([^LINUX_TRUE$])
++m4trace:configure.ac:56: -1- AC_SUBST([LINUX_FALSE])
++m4trace:configure.ac:56: -1- AC_SUBST_TRACE([LINUX_FALSE])
++m4trace:configure.ac:56: -1- m4_pattern_allow([^LINUX_FALSE$])
++m4trace:configure.ac:57: -1- AM_CONDITIONAL([DARWIN], [true])
++m4trace:configure.ac:57: -1- AC_SUBST([DARWIN_TRUE])
++m4trace:configure.ac:57: -1- AC_SUBST_TRACE([DARWIN_TRUE])
++m4trace:configure.ac:57: -1- m4_pattern_allow([^DARWIN_TRUE$])
++m4trace:configure.ac:57: -1- AC_SUBST([DARWIN_FALSE])
++m4trace:configure.ac:57: -1- AC_SUBST_TRACE([DARWIN_FALSE])
++m4trace:configure.ac:57: -1- m4_pattern_allow([^DARWIN_FALSE$])
++m4trace:configure.ac:58: -1- AM_CONDITIONAL([LINUX25], [true])
++m4trace:configure.ac:58: -1- AC_SUBST([LINUX25_TRUE])
++m4trace:configure.ac:58: -1- AC_SUBST_TRACE([LINUX25_TRUE])
++m4trace:configure.ac:58: -1- m4_pattern_allow([^LINUX25_TRUE$])
++m4trace:configure.ac:58: -1- AC_SUBST([LINUX25_FALSE])
++m4trace:configure.ac:58: -1- AC_SUBST_TRACE([LINUX25_FALSE])
++m4trace:configure.ac:58: -1- m4_pattern_allow([^LINUX25_FALSE$])
++m4trace:configure.ac:61: -1- AC_SUBST([LDISKFSDIR])
++m4trace:configure.ac:61: -1- AC_SUBST_TRACE([LDISKFSDIR])
++m4trace:configure.ac:61: -1- m4_pattern_allow([^LDISKFSDIR$])
++m4trace:configure.ac:65: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+configure.ac:72: the top level])
-+m4trace:configure.ac:77: -1- AC_SUBST([PATCH])
-+m4trace:configure.ac:77: -1- AC_SUBST_TRACE([PATCH])
-+m4trace:configure.ac:77: -1- m4_pattern_allow([^PATCH$])
-+m4trace:configure.ac:82: -1- AC_SUBST([QUILT])
-+m4trace:configure.ac:82: -1- AC_SUBST_TRACE([QUILT])
-+m4trace:configure.ac:82: -1- m4_pattern_allow([^QUILT$])
-+m4trace:configure.ac:89: -1- AM_CONDITIONAL([USE_QUILT], [test x$QUILT != xno])
-+m4trace:configure.ac:89: -1- AC_SUBST([USE_QUILT_TRUE])
-+m4trace:configure.ac:89: -1- AC_SUBST_TRACE([USE_QUILT_TRUE])
-+m4trace:configure.ac:89: -1- m4_pattern_allow([^USE_QUILT_TRUE$])
-+m4trace:configure.ac:89: -1- AC_SUBST([USE_QUILT_FALSE])
-+m4trace:configure.ac:89: -1- AC_SUBST_TRACE([USE_QUILT_FALSE])
-+m4trace:configure.ac:89: -1- m4_pattern_allow([^USE_QUILT_FALSE$])
-+m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_MODULE])
-+m4trace:configure.ac:91: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_MODULE$])
-+m4trace:configure.ac:91: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_MODULE], [/* build ldiskfs as a module */
++configure.ac:65: the top level])
++m4trace:configure.ac:70: -1- AC_SUBST([PATCH])
++m4trace:configure.ac:70: -1- AC_SUBST_TRACE([PATCH])
++m4trace:configure.ac:70: -1- m4_pattern_allow([^PATCH$])
++m4trace:configure.ac:75: -1- AC_SUBST([QUILT])
++m4trace:configure.ac:75: -1- AC_SUBST_TRACE([QUILT])
++m4trace:configure.ac:75: -1- m4_pattern_allow([^QUILT$])
++m4trace:configure.ac:82: -1- AM_CONDITIONAL([USE_QUILT], [test x$QUILT != xno])
++m4trace:configure.ac:82: -1- AC_SUBST([USE_QUILT_TRUE])
++m4trace:configure.ac:82: -1- AC_SUBST_TRACE([USE_QUILT_TRUE])
++m4trace:configure.ac:82: -1- m4_pattern_allow([^USE_QUILT_TRUE$])
++m4trace:configure.ac:82: -1- AC_SUBST([USE_QUILT_FALSE])
++m4trace:configure.ac:82: -1- AC_SUBST_TRACE([USE_QUILT_FALSE])
++m4trace:configure.ac:82: -1- m4_pattern_allow([^USE_QUILT_FALSE$])
++m4trace:configure.ac:84: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_MODULE])
++m4trace:configure.ac:84: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_MODULE$])
++m4trace:configure.ac:84: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_MODULE], [/* build ldiskfs as a module */
 +#undef CONFIG_LDISKFS_FS_MODULE])
-+m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_XATTR])
-+m4trace:configure.ac:91: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_XATTR$])
-+m4trace:configure.ac:91: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_XATTR], [/* enable extended attributes for ldiskfs */
++m4trace:configure.ac:84: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_XATTR])
++m4trace:configure.ac:84: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_XATTR$])
++m4trace:configure.ac:84: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_XATTR], [/* enable extended attributes for ldiskfs */
 +#undef CONFIG_LDISKFS_FS_XATTR])
-+m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_POSIX_ACL])
-+m4trace:configure.ac:91: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_POSIX_ACL$])
-+m4trace:configure.ac:91: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_POSIX_ACL], [/* enable posix acls for ldiskfs */
++m4trace:configure.ac:84: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_POSIX_ACL])
++m4trace:configure.ac:84: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_POSIX_ACL$])
++m4trace:configure.ac:84: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_POSIX_ACL], [/* enable posix acls for ldiskfs */
 +#undef CONFIG_LDISKFS_FS_POSIX_ACL])
-+m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_SECURITY])
-+m4trace:configure.ac:91: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_SECURITY$])
-+m4trace:configure.ac:91: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_SECURITY], [/* enable fs security for ldiskfs */
++m4trace:configure.ac:84: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_SECURITY])
++m4trace:configure.ac:84: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_SECURITY$])
++m4trace:configure.ac:84: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_SECURITY], [/* enable fs security for ldiskfs */
 +#undef CONFIG_LDISKFS_FS_SECURITY])
-+m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFSDEV_FS_POSIX_ACL])
-+m4trace:configure.ac:91: -1- m4_pattern_allow([^CONFIG_LDISKFSDEV_FS_POSIX_ACL$])
-+m4trace:configure.ac:91: -1- AH_OUTPUT([CONFIG_LDISKFSDEV_FS_POSIX_ACL], [/* enable posix acls for ldiskfs */
++m4trace:configure.ac:84: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFSDEV_FS_POSIX_ACL])
++m4trace:configure.ac:84: -1- m4_pattern_allow([^CONFIG_LDISKFSDEV_FS_POSIX_ACL$])
++m4trace:configure.ac:84: -1- AH_OUTPUT([CONFIG_LDISKFSDEV_FS_POSIX_ACL], [/* enable posix acls for ldiskfs */
 +#undef CONFIG_LDISKFSDEV_FS_POSIX_ACL])
-+m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFSDEV_FS_XATTR])
-+m4trace:configure.ac:91: -1- m4_pattern_allow([^CONFIG_LDISKFSDEV_FS_XATTR$])
-+m4trace:configure.ac:91: -1- AH_OUTPUT([CONFIG_LDISKFSDEV_FS_XATTR], [/* enable extented attributes for ldiskfs */
++m4trace:configure.ac:84: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFSDEV_FS_XATTR])
++m4trace:configure.ac:84: -1- m4_pattern_allow([^CONFIG_LDISKFSDEV_FS_XATTR$])
++m4trace:configure.ac:84: -1- AH_OUTPUT([CONFIG_LDISKFSDEV_FS_XATTR], [/* enable extented attributes for ldiskfs */
 +#undef CONFIG_LDISKFSDEV_FS_XATTR])
-+m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFSDEV_FS_SECURITY])
-+m4trace:configure.ac:91: -1- m4_pattern_allow([^CONFIG_LDISKFSDEV_FS_SECURITY$])
-+m4trace:configure.ac:91: -1- AH_OUTPUT([CONFIG_LDISKFSDEV_FS_SECURITY], [/* enable fs security for ldiskfs */
++m4trace:configure.ac:84: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFSDEV_FS_SECURITY])
++m4trace:configure.ac:84: -1- m4_pattern_allow([^CONFIG_LDISKFSDEV_FS_SECURITY$])
++m4trace:configure.ac:84: -1- AH_OUTPUT([CONFIG_LDISKFSDEV_FS_SECURITY], [/* enable fs security for ldiskfs */
 +#undef CONFIG_LDISKFSDEV_FS_SECURITY])
-+m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([CONFIG_LDISKFS_FS_NFS4ACL])
-+m4trace:configure.ac:91: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_NFS4ACL$])
-+m4trace:configure.ac:91: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_NFS4ACL], [/* enable fs security for ldiskfs */
-+#undef CONFIG_LDISKFS_FS_NFS4ACL])
-+m4trace:configure.ac:96: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+configure.ac:96: the top level])
-+m4trace:configure.ac:110: -1- AC_DEFINE_TRACE_LITERAL([HAVE_EXT4_LDISKFS])
-+m4trace:configure.ac:110: -1- m4_pattern_allow([^HAVE_EXT4_LDISKFS$])
-+m4trace:configure.ac:110: -1- AH_OUTPUT([HAVE_EXT4_LDISKFS], [/* ldiskfs based on ext4 */
++m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([HAVE_EXT4_LDISKFS])
++m4trace:configure.ac:87: -1- m4_pattern_allow([^HAVE_EXT4_LDISKFS$])
++m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_EXT4_LDISKFS], [/* ldiskfs based on ext4 */
 +#undef HAVE_EXT4_LDISKFS])
-+m4trace:configure.ac:116: -1- AC_SUBST([BACKFS])
-+m4trace:configure.ac:116: -1- AC_SUBST_TRACE([BACKFS])
-+m4trace:configure.ac:116: -1- m4_pattern_allow([^BACKFS$])
-+m4trace:configure.ac:118: -1- AC_SUBST([BACKFSU])
-+m4trace:configure.ac:118: -1- AC_SUBST_TRACE([BACKFSU])
-+m4trace:configure.ac:118: -1- m4_pattern_allow([^BACKFSU$])
-+m4trace:configure.ac:120: -1- AM_CONDITIONAL([USE_EXT4], [test x$enable_ext4 = xyes])
-+m4trace:configure.ac:120: -1- AC_SUBST([USE_EXT4_TRUE])
-+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([USE_EXT4_TRUE])
-+m4trace:configure.ac:120: -1- m4_pattern_allow([^USE_EXT4_TRUE$])
-+m4trace:configure.ac:120: -1- AC_SUBST([USE_EXT4_FALSE])
-+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([USE_EXT4_FALSE])
-+m4trace:configure.ac:120: -1- m4_pattern_allow([^USE_EXT4_FALSE$])
-+m4trace:configure.ac:151: -1- AC_SUBST([LDISKFS_SERIES])
-+m4trace:configure.ac:151: -1- AC_SUBST_TRACE([LDISKFS_SERIES])
-+m4trace:configure.ac:151: -1- m4_pattern_allow([^LDISKFS_SERIES$])
-+m4trace:configure.ac:153: -1- AC_SUBST([ac_configure_args])
-+m4trace:configure.ac:153: -1- AC_SUBST_TRACE([ac_configure_args])
-+m4trace:configure.ac:153: -1- m4_pattern_allow([^ac_configure_args$])
-+m4trace:configure.ac:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_D_REHASH_COND])
-+m4trace:configure.ac:155: -1- m4_pattern_allow([^HAVE_D_REHASH_COND$])
-+m4trace:configure.ac:155: -1- AH_OUTPUT([HAVE_D_REHASH_COND], [/* d_rehash_cond is exported by the kernel */
++m4trace:configure.ac:93: -1- AC_SUBST([BACKFS])
++m4trace:configure.ac:93: -1- AC_SUBST_TRACE([BACKFS])
++m4trace:configure.ac:93: -1- m4_pattern_allow([^BACKFS$])
++m4trace:configure.ac:95: -1- AC_SUBST([BACKFSU])
++m4trace:configure.ac:95: -1- AC_SUBST_TRACE([BACKFSU])
++m4trace:configure.ac:95: -1- m4_pattern_allow([^BACKFSU$])
++m4trace:configure.ac:97: -1- AM_CONDITIONAL([USE_EXT4], [test x$enable_ext4 = xyes])
++m4trace:configure.ac:97: -1- AC_SUBST([USE_EXT4_TRUE])
++m4trace:configure.ac:97: -1- AC_SUBST_TRACE([USE_EXT4_TRUE])
++m4trace:configure.ac:97: -1- m4_pattern_allow([^USE_EXT4_TRUE$])
++m4trace:configure.ac:97: -1- AC_SUBST([USE_EXT4_FALSE])
++m4trace:configure.ac:97: -1- AC_SUBST_TRACE([USE_EXT4_FALSE])
++m4trace:configure.ac:97: -1- m4_pattern_allow([^USE_EXT4_FALSE$])
++m4trace:configure.ac:128: -1- AC_SUBST([LDISKFS_SERIES])
++m4trace:configure.ac:128: -1- AC_SUBST_TRACE([LDISKFS_SERIES])
++m4trace:configure.ac:128: -1- m4_pattern_allow([^LDISKFS_SERIES$])
++m4trace:configure.ac:130: -1- AC_SUBST([ac_configure_args])
++m4trace:configure.ac:130: -1- AC_SUBST_TRACE([ac_configure_args])
++m4trace:configure.ac:130: -1- m4_pattern_allow([^ac_configure_args$])
++m4trace:configure.ac:132: -1- AC_DEFINE_TRACE_LITERAL([HAVE_D_REHASH_COND])
++m4trace:configure.ac:132: -1- m4_pattern_allow([^HAVE_D_REHASH_COND$])
++m4trace:configure.ac:132: -1- AH_OUTPUT([HAVE_D_REHASH_COND], [/* d_rehash_cond is exported by the kernel */
 +#undef HAVE_D_REHASH_COND])
-+m4trace:configure.ac:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_D_REHASH_COND])
-+m4trace:configure.ac:155: -1- m4_pattern_allow([^HAVE_D_REHASH_COND$])
-+m4trace:configure.ac:155: -1- AH_OUTPUT([HAVE_D_REHASH_COND], [/* d_rehash_cond is exported by the kernel */
++m4trace:configure.ac:132: -1- AC_DEFINE_TRACE_LITERAL([HAVE_D_REHASH_COND])
++m4trace:configure.ac:132: -1- m4_pattern_allow([^HAVE_D_REHASH_COND$])
++m4trace:configure.ac:132: -1- AH_OUTPUT([HAVE_D_REHASH_COND], [/* d_rehash_cond is exported by the kernel */
 +#undef HAVE_D_REHASH_COND])
-+m4trace:configure.ac:161: -1- AC_DEFINE_TRACE_LITERAL([HAVE___D_REHASH])
-+m4trace:configure.ac:161: -1- m4_pattern_allow([^HAVE___D_REHASH$])
-+m4trace:configure.ac:161: -1- AH_OUTPUT([HAVE___D_REHASH], [/* __d_rehash is exported by the kernel */
++m4trace:configure.ac:138: -1- AC_DEFINE_TRACE_LITERAL([HAVE___D_REHASH])
++m4trace:configure.ac:138: -1- m4_pattern_allow([^HAVE___D_REHASH$])
++m4trace:configure.ac:138: -1- AH_OUTPUT([HAVE___D_REHASH], [/* __d_rehash is exported by the kernel */
 +#undef HAVE___D_REHASH])
-+m4trace:configure.ac:161: -1- AC_DEFINE_TRACE_LITERAL([HAVE___D_REHASH])
-+m4trace:configure.ac:161: -1- m4_pattern_allow([^HAVE___D_REHASH$])
-+m4trace:configure.ac:161: -1- AH_OUTPUT([HAVE___D_REHASH], [/* __d_rehash is exported by the kernel */
++m4trace:configure.ac:138: -1- AC_DEFINE_TRACE_LITERAL([HAVE___D_REHASH])
++m4trace:configure.ac:138: -1- m4_pattern_allow([^HAVE___D_REHASH$])
++m4trace:configure.ac:138: -1- AH_OUTPUT([HAVE___D_REHASH], [/* __d_rehash is exported by the kernel */
 +#undef HAVE___D_REHASH])
-+m4trace:configure.ac:167: -1- AC_DEFINE_TRACE_LITERAL([HAVE_D_MOVE_LOCKED])
-+m4trace:configure.ac:167: -1- m4_pattern_allow([^HAVE_D_MOVE_LOCKED$])
-+m4trace:configure.ac:167: -1- AH_OUTPUT([HAVE_D_MOVE_LOCKED], [/* d_move_locked is exported by the kernel */
++m4trace:configure.ac:144: -1- AC_DEFINE_TRACE_LITERAL([HAVE_D_MOVE_LOCKED])
++m4trace:configure.ac:144: -1- m4_pattern_allow([^HAVE_D_MOVE_LOCKED$])
++m4trace:configure.ac:144: -1- AH_OUTPUT([HAVE_D_MOVE_LOCKED], [/* d_move_locked is exported by the kernel */
 +#undef HAVE_D_MOVE_LOCKED])
-+m4trace:configure.ac:167: -1- AC_DEFINE_TRACE_LITERAL([HAVE_D_MOVE_LOCKED])
-+m4trace:configure.ac:167: -1- m4_pattern_allow([^HAVE_D_MOVE_LOCKED$])
-+m4trace:configure.ac:167: -1- AH_OUTPUT([HAVE_D_MOVE_LOCKED], [/* d_move_locked is exported by the kernel */
++m4trace:configure.ac:144: -1- AC_DEFINE_TRACE_LITERAL([HAVE_D_MOVE_LOCKED])
++m4trace:configure.ac:144: -1- m4_pattern_allow([^HAVE_D_MOVE_LOCKED$])
++m4trace:configure.ac:144: -1- AH_OUTPUT([HAVE_D_MOVE_LOCKED], [/* d_move_locked is exported by the kernel */
 +#undef HAVE_D_MOVE_LOCKED])
-+m4trace:configure.ac:173: -1- AC_DEFINE_TRACE_LITERAL([HAVE___D_MOVE])
-+m4trace:configure.ac:173: -1- m4_pattern_allow([^HAVE___D_MOVE$])
-+m4trace:configure.ac:173: -1- AH_OUTPUT([HAVE___D_MOVE], [/* __d_move exported by the kernel */
++m4trace:configure.ac:150: -1- AC_DEFINE_TRACE_LITERAL([HAVE___D_MOVE])
++m4trace:configure.ac:150: -1- m4_pattern_allow([^HAVE___D_MOVE$])
++m4trace:configure.ac:150: -1- AH_OUTPUT([HAVE___D_MOVE], [/* __d_move exported by the kernel */
 +#undef HAVE___D_MOVE])
-+m4trace:configure.ac:173: -1- AC_DEFINE_TRACE_LITERAL([HAVE___D_MOVE])
-+m4trace:configure.ac:173: -1- m4_pattern_allow([^HAVE___D_MOVE$])
-+m4trace:configure.ac:173: -1- AH_OUTPUT([HAVE___D_MOVE], [/* __d_move exported by the kernel */
++m4trace:configure.ac:150: -1- AC_DEFINE_TRACE_LITERAL([HAVE___D_MOVE])
++m4trace:configure.ac:150: -1- m4_pattern_allow([^HAVE___D_MOVE$])
++m4trace:configure.ac:150: -1- AH_OUTPUT([HAVE___D_MOVE], [/* __d_move exported by the kernel */
 +#undef HAVE___D_MOVE])
-+m4trace:configure.ac:179: -1- AC_CONFIG_FILES([Makefile
++m4trace:configure.ac:156: -1- AC_CONFIG_FILES([Makefile
 +autoMakefile
 +
 +Rules:build/Rules.in
 +lustre-ldiskfs.spec
 +])
-+m4trace:configure.ac:180: -1- AC_CONFIG_FILES([ldiskfs/autoMakefile ldiskfs/Makefile])
-+m4trace:configure.ac:183: -1- AC_SUBST([MOSTLYCLEANFILES])
-+m4trace:configure.ac:183: -1- AC_SUBST_TRACE([MOSTLYCLEANFILES])
-+m4trace:configure.ac:183: -1- m4_pattern_allow([^MOSTLYCLEANFILES$])
-+m4trace:configure.ac:185: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
-+m4trace:configure.ac:185: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-+m4trace:configure.ac:185: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([LTLIBOBJS])
-+m4trace:configure.ac:185: -1- m4_pattern_allow([^LTLIBOBJS$])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([top_builddir])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([srcdir])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([abs_srcdir])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([top_srcdir])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([abs_top_srcdir])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([builddir])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([abs_builddir])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([abs_top_builddir])
-+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([INSTALL])
-diff -Nurwd lustre-1.8.1.orig/ldiskfs/autoMakefile.in lustre-1.8.1/ldiskfs/autoMakefile.in
---- lustre-1.8.1.orig/ldiskfs/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/ldiskfs/autoMakefile.in	2009-09-10 11:17:19.000000000 +0200
-@@ -68,6 +68,7 @@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
-+GREP = @GREP@
- INCLUDE_RULES = @INCLUDE_RULES@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -121,8 +122,6 @@
- VERSION = @VERSION@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
-@@ -135,12 +134,16 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-@@ -148,14 +151,17 @@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -202,8 +208,8 @@
- DIST_COMMON = $(srcdir)/autoMakefile.in \
- 	$(srcdir)/build/autoMakefile.am.toplevel $(srcdir)/configure \
- 	COPYING ChangeLog Makefile.in aclocal.m4 autoMakefile.am \
--	config.guess config.h.in config.sub configure.ac install-sh \
--	lustre-ldiskfs.spec.in missing mkinstalldirs
-+	config.guess config.h.in config.sub configure configure.ac \
-+	install-sh lustre-ldiskfs.spec.in missing mkinstalldirs
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-diff -Nurwd lustre-1.8.1.orig/ldiskfs/config.h.in lustre-1.8.1/ldiskfs/config.h.in
---- lustre-1.8.1.orig/ldiskfs/config.h.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/ldiskfs/config.h.in	2009-09-10 11:17:16.000000000 +0200
-@@ -84,7 +84,7 @@
++m4trace:configure.ac:157: -1- AC_CONFIG_FILES([ldiskfs/autoMakefile ldiskfs/Makefile])
++m4trace:configure.ac:160: -1- AC_SUBST([MOSTLYCLEANFILES])
++m4trace:configure.ac:160: -1- AC_SUBST_TRACE([MOSTLYCLEANFILES])
++m4trace:configure.ac:160: -1- m4_pattern_allow([^MOSTLYCLEANFILES$])
++m4trace:configure.ac:162: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
++m4trace:configure.ac:162: -1- m4_pattern_allow([^LIB@&t at OBJS$])
++m4trace:configure.ac:162: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([LTLIBOBJS])
++m4trace:configure.ac:162: -1- m4_pattern_allow([^LTLIBOBJS$])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([top_builddir])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([srcdir])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([abs_srcdir])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([top_srcdir])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([abs_top_srcdir])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([builddir])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([abs_builddir])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([abs_top_builddir])
++m4trace:configure.ac:162: -1- AC_SUBST_TRACE([INSTALL])
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/build/autogen.sh lustre-1.8.2/ldiskfs/build/autogen.sh
+--- orig/lustre-1.8.2/ldiskfs/build/autogen.sh	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/build/autogen.sh	2010-03-03 15:57:14.819658335 +0000
+@@ -0,0 +1,128 @@
++#!/bin/bash
++
++# taken from gnome-common/macros2/autogen.sh
++compare_versions() {
++    ch_min_version=$1
++    ch_actual_version=$2
++    ch_status=0
++    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
++    set $ch_actual_version
++    for ch_min in $ch_min_version; do
++        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
++        if [ -z "$ch_min" ]; then break; fi
++        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
++        if [ $ch_cur -gt $ch_min ]; then break; fi
++        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
++    done
++    IFS="$ch_save_IFS"
++    return $ch_status
++}
++
++error_msg() {
++	echo "$cmd is $1.  version $required is required to build Lustre."
++
++	if [ -e /usr/lib/autolustre/bin/$cmd ]; then
++		cat >&2 <<-EOF
++		You apparently already have Lustre-specific autoconf/make RPMs
++		installed on your system at /usr/lib/autolustre/share/$cmd.
++		Please set your PATH to point to those versions:
++
++		export PATH="/usr/lib/autolustre/bin:\$PATH"
++		EOF
++	else
++		cat >&2 <<-EOF
++		CFS provides RPMs which can be installed alongside your
++		existing autoconf/make RPMs, if you are nervous about
++		upgrading.  See
++
++		ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
++
++		You may be able to download newer version from:
++
++		http://ftp.gnu.org/gnu/$tool/$tool-$required.tar.gz
++	EOF
++	fi
++	[ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
++
++or for RH9 systems you can use:
++
++ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
++EOF
++	[ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
++
++or for RH9 systems you can use:
++
++ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
++EOF
++	exit 1
++}
++
++check_version() {
++    local tool
++    local cmd
++    local required
++    local version
++
++    tool=$1
++    cmd=$2
++    required=$3
++    echo -n "checking for $cmd $required... "
++    if ! $cmd --version >/dev/null ; then
++	error_msg "missing"
++    fi
++    version=$($cmd --version | awk "/$tool \(GNU/ { print \$4 }")
++    echo "found $version"
++    if ! compare_versions "$required" "$version" ; then
++	error_msg "too old"
++    fi
++}
++
++echo "Checking for a complete tree..."
++if [ -d kernel_patches ] ; then
++    # This is ldiskfs
++    REQUIRED_DIRS="build"
++    CONFIGURE_DIRS=""
++else
++    REQUIRED_DIRS="build lnet lustre"
++    OPTIONAL_DIRS="snmp portals"
++    CONFIGURE_DIRS="libsysio ldiskfs"
++fi
++
++for dir in $REQUIRED_DIRS ; do
++    if [ ! -d "$dir" ] ; then
++	cat >&2 <<EOF
++Your tree seems to be missing $dir.
++Please read README.lustrecvs for details.
++EOF
++	exit 1
++    fi
++    ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
++done
++# optional directories for Lustre
++for dir in $OPTIONAL_DIRS; do
++    if [ -d "$dir" ] ; then
++	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
++    fi
++done
++
++check_version automake automake-1.7 "1.7.8"
++check_version autoconf autoconf "2.57"
++
++echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
++aclocal-1.7 $ACLOCAL_FLAGS || exit 1
++echo "Running autoheader..."
++autoheader || exit 1
++echo "Running automake-1.7..."
++automake-1.7 -a -c || exit 1
++echo "Running autoconf..."
++autoconf || exit 1
++
++# Run autogen.sh in these directories
++for dir in $CONFIGURE_DIRS; do
++    if [ -d $dir ] ; then
++        pushd $dir >/dev/null
++        echo "Running autogen for $dir..."
++        sh autogen.sh || exit $?
++        popd >/dev/null
++    fi
++done
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/config.h.in lustre-1.8.2/ldiskfs/config.h.in
+--- orig/lustre-1.8.2/ldiskfs/config.h.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/config.h.in	2010-03-03 16:00:18.396634183 +0000
+@@ -81,7 +81,7 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
@@ -51534,10 +52491,10 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/config.h.in lustre-1.8.1/ldiskfs/config.h.
  #undef SIZEOF_UNSIGNED_LONG_LONG
  
  /* Define to 1 if you have the ANSI C header files. */
-diff -Nurwd lustre-1.8.1.orig/ldiskfs/config.h.in~ lustre-1.8.1/ldiskfs/config.h.in~
---- lustre-1.8.1.orig/ldiskfs/config.h.in~	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/ldiskfs/config.h.in~	2009-07-25 00:28:56.000000000 +0200
-@@ -0,0 +1,94 @@
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/config.h.in~ lustre-1.8.2/ldiskfs/config.h.in~
+--- orig/lustre-1.8.2/ldiskfs/config.h.in~	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/config.h.in~	2010-03-03 13:43:00.000000000 +0000
+@@ -0,0 +1,91 @@
 +/* config.h.in.  Generated from configure.ac by autoheader.  */
 +
 +/* enable posix acls for ldiskfs */
@@ -51552,9 +52509,6 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/config.h.in~ lustre-1.8.1/ldiskfs/config.h
 +/* build ldiskfs as a module */
 +#undef CONFIG_LDISKFS_FS_MODULE
 +
-+/* enable fs security for ldiskfs */
-+#undef CONFIG_LDISKFS_FS_NFS4ACL
-+
 +/* enable posix acls for ldiskfs */
 +#undef CONFIG_LDISKFS_FS_POSIX_ACL
 +
@@ -51632,9 +52586,9 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/config.h.in~ lustre-1.8.1/ldiskfs/config.h
 +
 +/* Version number of package */
 +#undef VERSION
-diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
---- lustre-1.8.1.orig/ldiskfs/configure	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/ldiskfs/configure	2009-09-10 11:17:21.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/configure lustre-1.8.2/ldiskfs/configure
+--- orig/lustre-1.8.2/ldiskfs/configure	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/configure	2010-03-03 16:00:19.084632645 +0000
 @@ -1,27 +1,56 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -52919,7 +53873,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  _ACEOF
  
    cat <<\_ACEOF
-@@ -877,8 +1358,9 @@
+@@ -876,8 +1357,9 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -52931,7 +53885,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    CPP         C preprocessor
  
  Use these variables to override the choices made by `configure' or to help
-@@ -886,120 +1368,86 @@
+@@ -885,120 +1367,86 @@
  
  Report bugs to <https://bugzilla.lustre.org/>.
  _ACEOF
@@ -53097,7 +54051,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1018,7 +1466,7 @@
+@@ -1017,7 +1465,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -53106,7 +54060,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1032,6 +1480,7 @@
+@@ -1031,6 +1479,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -53114,7 +54068,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  } >&5
  
-@@ -1053,7 +1502,6 @@
+@@ -1052,7 +1501,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -53122,7 +54076,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1064,7 +1512,7 @@
+@@ -1063,7 +1511,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -53131,7 +54085,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1086,9 +1534,7 @@
+@@ -1085,9 +1533,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -53142,7 +54096,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
        ;;
      esac
    done
-@@ -1099,8 +1545,8 @@
+@@ -1098,8 +1544,8 @@
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -53153,7 +54107,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1113,20 +1559,34 @@
+@@ -1112,20 +1558,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -53198,7 +54152,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
      echo
  
      cat <<\_ASBOX
-@@ -1137,22 +1597,28 @@
+@@ -1136,22 +1596,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -53234,7 +54188,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
        done | sort
        echo
      fi
-@@ -1164,15 +1630,15 @@
+@@ -1163,15 +1629,15 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -53253,7 +54207,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
      exit $exit_status
       ' 0
  for ac_signal in 1 2 13 15; do
-@@ -1181,9 +1647,7 @@
+@@ -1180,9 +1646,7 @@
  ac_signal=0
  
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
@@ -53264,7 +54218,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  # Predefined preprocessor variables.
  
-@@ -1214,14 +1678,17 @@
+@@ -1213,14 +1677,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -53288,7 +54242,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1237,8 +1704,8 @@
+@@ -1236,8 +1703,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -53299,7 +54253,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
      esac
    fi
  else
-@@ -1250,12 +1717,11 @@
+@@ -1249,12 +1716,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -53315,7 +54269,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1280,8 +1746,7 @@
+@@ -1279,8 +1745,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -53325,7 +54279,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1298,12 +1763,6 @@
+@@ -1297,12 +1762,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -53338,7 +54292,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  
  
-@@ -1328,111 +1787,166 @@
+@@ -1327,111 +1786,166 @@
  
  
  
@@ -53557,7 +54511,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1456,8 +1970,8 @@
+@@ -1455,8 +1969,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -53568,7 +54522,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1479,7 +1993,7 @@
+@@ -1478,7 +1992,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -53577,7 +54531,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -1498,21 +2012,22 @@
+@@ -1497,21 +2011,22 @@
      ;;
  esac
  done
@@ -53605,7 +54559,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -1522,8 +2037,8 @@
+@@ -1521,8 +2036,8 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -53616,7 +54570,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -1565,20 +2080,20 @@
+@@ -1564,20 +2079,20 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -53642,7 +54596,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  
  # expand $ac_aux_dir to an absolute path
-@@ -1598,8 +2113,8 @@
+@@ -1597,8 +2112,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -53653,7 +54607,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1612,54 +2127,57 @@
+@@ -1611,54 +2126,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -53732,7 +54686,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -1733,8 +2251,8 @@
+@@ -1732,8 +2250,8 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -53743,7 +54697,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1747,32 +2265,34 @@
+@@ -1746,32 +2264,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -53785,7 +54739,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1785,27 +2305,41 @@
+@@ -1784,27 +2304,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -53833,7 +54787,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -1827,8 +2361,8 @@
+@@ -1826,8 +2360,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -53844,7 +54798,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1841,32 +2375,34 @@
+@@ -1840,32 +2374,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -53886,7 +54840,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1879,26 +2415,41 @@
+@@ -1878,26 +2414,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -53933,7 +54887,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  else
    CC="$ac_cv_prog_CC"
  fi
-@@ -1907,8 +2458,8 @@
+@@ -1906,8 +2457,8 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -53944,7 +54898,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1921,74 +2472,34 @@
+@@ -1920,74 +2471,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -54027,7 +54981,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2002,7 +2513,7 @@
+@@ -2001,7 +2512,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -54036,7 +54990,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2013,6 +2524,7 @@
+@@ -2012,6 +2523,7 @@
    fi
  done
  done
@@ -54044,7 +54998,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2030,22 +2542,23 @@
+@@ -2029,22 +2541,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -54075,7 +55029,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2058,36 +2571,38 @@
+@@ -2057,36 +2570,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -54122,7 +55076,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2100,30 +2615,46 @@
+@@ -2099,30 +2614,46 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -54174,7 +55128,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  fi
  
-@@ -2135,21 +2666,35 @@
+@@ -2134,21 +2665,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -54218,7 +55172,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2174,47 +2719,77 @@
+@@ -2173,47 +2718,77 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -54317,7 +55271,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -2226,19 +2801,21 @@
+@@ -2225,19 +2800,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -54346,7 +55300,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2257,22 +2834,27 @@
+@@ -2256,22 +2833,27 @@
      fi
    fi
  fi
@@ -54385,7 +55339,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -2283,9 +2865,8 @@
+@@ -2282,9 +2864,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -54396,7 +55350,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  	  break;;
      * ) break;;
    esac
-@@ -2299,14 +2880,14 @@
+@@ -2298,14 +2879,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -54415,7 +55369,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2326,14 +2907,20 @@
+@@ -2325,14 +2906,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -54440,7 +55394,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -2351,12 +2938,12 @@
+@@ -2350,12 +2937,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -54457,7 +55411,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2379,27 +2966,22 @@
+@@ -2378,27 +2965,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -54496,7 +55450,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -2407,21 +2989,25 @@
+@@ -2406,21 +2988,25 @@
  
  ac_compiler_gnu=no
  fi
@@ -54528,7 +55482,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -2438,38 +3024,118 @@
+@@ -2437,38 +3023,118 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -54663,7 +55617,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2485,12 +3151,12 @@
+@@ -2484,12 +3150,12 @@
      CFLAGS=
    fi
  fi
@@ -54680,7 +55634,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2524,12 +3190,17 @@
+@@ -2523,12 +3189,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -54700,7 +55654,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2544,205 +3215,57 @@
+@@ -2543,205 +3214,57 @@
    return 0;
  }
  _ACEOF
@@ -54916,7 +55870,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
@@ -54930,13 +55884,13 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2760,8 +3283,8 @@
+@@ -2759,8 +3282,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -54947,7 +55901,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2788,15 +3311,15 @@
+@@ -2787,15 +3310,15 @@
  fi
  
  
@@ -54968,7 +55922,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2816,8 +3339,8 @@
+@@ -2815,8 +3338,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -54979,7 +55933,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2899,8 +3422,8 @@
+@@ -2898,8 +3421,8 @@
  fi
  
  fi
@@ -54990,7 +55944,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -2938,8 +3461,8 @@
+@@ -2937,8 +3460,8 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -55001,7 +55955,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -2973,24 +3496,22 @@
+@@ -2972,24 +3495,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -55037,7 +55991,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -2999,9 +3520,10 @@
+@@ -2998,9 +3519,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -55049,7 +56003,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3011,24 +3533,22 @@
+@@ -3010,24 +3532,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -55085,7 +56039,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    # Broken: success on invalid input.
  continue
  else
-@@ -3039,6 +3559,7 @@
+@@ -3038,6 +3558,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -55093,7 +56047,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3056,8 +3577,8 @@
+@@ -3055,8 +3576,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -55104,7 +56058,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3080,24 +3601,22 @@
+@@ -3079,24 +3600,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -55140,7 +56094,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -3106,9 +3625,10 @@
+@@ -3105,9 +3624,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -55152,7 +56106,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3118,24 +3638,22 @@
+@@ -3117,24 +3637,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -55188,7 +56142,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    # Broken: success on invalid input.
  continue
  else
-@@ -3146,6 +3664,7 @@
+@@ -3145,6 +3663,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -55196,7 +56150,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3168,23 +3687,170 @@
+@@ -3167,23 +3686,170 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -55378,7 +56332,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3208,27 +3874,22 @@
+@@ -3207,27 +3873,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -55417,7 +56371,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_cv_header_stdc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -3236,7 +3897,8 @@
+@@ -3235,7 +3896,8 @@
  
  ac_cv_header_stdc=no
  fi
@@ -55427,7 +56381,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -3292,6 +3954,7 @@
+@@ -3291,6 +3953,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -55435,7 +56389,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3311,18 +3974,27 @@
+@@ -3310,18 +3973,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -55469,7 +56423,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3335,12 +4007,14 @@
+@@ -3334,12 +4006,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -55487,7 +56441,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -3363,9 +4037,9 @@
+@@ -3362,9 +4036,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -55500,7 +56454,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -3379,27 +4053,22 @@
+@@ -3378,27 +4052,22 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -55539,7 +56493,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    eval "$as_ac_Header=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -3407,10 +4076,12 @@
+@@ -3406,10 +4075,12 @@
  
  eval "$as_ac_Header=no"
  fi
@@ -55555,7 +56509,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -3424,8 +4095,8 @@
+@@ -3423,8 +4094,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -55566,7 +56520,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3438,32 +4109,34 @@
+@@ -3437,32 +4108,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -55608,7 +56562,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3476,37 +4149,51 @@
+@@ -3475,37 +4148,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -55670,7 +56624,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  	echo
  	echo "   '$CC_VERSION'"
  	echo "  has been known to generate bad code, "
-@@ -3531,14 +4218,14 @@
+@@ -3530,14 +4217,14 @@
  		bad_cc
  		;;
  	*)
@@ -55689,7 +56643,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_type_unsigned_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3549,39 +4236,35 @@
+@@ -3548,39 +4235,35 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -55743,7 +56697,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_cv_type_unsigned_long_long=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -3589,21 +4272,21 @@
+@@ -3588,21 +4271,21 @@
  
  ac_cv_type_unsigned_long_long=no
  fi
@@ -55775,7 +56729,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -3613,10 +4296,11 @@
+@@ -3612,10 +4295,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -55788,7 +56742,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  test_array [0] = 0
  
    ;
-@@ -3624,27 +4308,22 @@
+@@ -3623,27 +4307,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -55827,7 +56781,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -3654,10 +4333,11 @@
+@@ -3653,10 +4332,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -55840,7 +56794,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  test_array [0] = 0
  
    ;
-@@ -3665,27 +4345,22 @@
+@@ -3664,27 +4344,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -55879,7 +56833,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_hi=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
-@@ -3698,7 +4373,8 @@
+@@ -3697,7 +4372,8 @@
  		    fi
  		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
@@ -55889,7 +56843,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    done
  else
    echo "$as_me: failed program was:" >&5
-@@ -3711,10 +4387,11 @@
+@@ -3710,10 +4386,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -55902,7 +56856,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  test_array [0] = 0
  
    ;
-@@ -3722,27 +4399,22 @@
+@@ -3721,27 +4398,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -55941,7 +56895,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -3752,10 +4424,11 @@
+@@ -3751,10 +4423,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -55954,7 +56908,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  test_array [0] = 0
  
    ;
-@@ -3763,27 +4436,22 @@
+@@ -3762,27 +4435,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -55993,7 +56947,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
-@@ -3796,7 +4464,8 @@
+@@ -3795,7 +4463,8 @@
  		       fi
  		       ac_mid=`expr 2 '*' $ac_mid`
  fi
@@ -56003,7 +56957,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    done
  else
    echo "$as_me: failed program was:" >&5
-@@ -3804,9 +4473,11 @@
+@@ -3803,9 +4472,11 @@
  
  ac_lo= ac_hi=
  fi
@@ -56017,7 +56971,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -3817,10 +4488,11 @@
+@@ -3816,10 +4487,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -56030,7 +56984,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  test_array [0] = 0
  
    ;
-@@ -3828,27 +4500,22 @@
+@@ -3827,27 +4499,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -56069,7 +57023,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_hi=$ac_mid
  else
    echo "$as_me: failed program was:" >&5
-@@ -3856,23 +4523,21 @@
+@@ -3855,23 +4522,21 @@
  
  ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
@@ -56102,7 +57056,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3881,8 +4546,9 @@
+@@ -3880,8 +4545,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -56114,7 +57068,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -3891,35 +4557,44 @@
+@@ -3890,35 +4556,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -56172,7 +57126,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3930,22 +4605,25 @@
+@@ -3929,22 +4604,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -56195,8 +57149,8 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_unsigned_long_long=0
--fi
  fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long" >&5
@@ -56207,7 +57161,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long
  _ACEOF
-@@ -3990,12 +4668,11 @@
+@@ -3988,12 +4666,11 @@
  
  
  
@@ -56224,7 +57178,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  else
    case $target_os in
  	linux* | darwin*)
-@@ -4006,18 +4683,18 @@
+@@ -4004,18 +4681,18 @@
  		;;
  esac
  
@@ -56251,7 +57205,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  		if ! [[ $with_linux = /* ]]; then
  			{ { echo "$as_me:$LINENO: error: You must provide an absolute pathname to the --with-linux= option." >&5
  echo "$as_me: error: You must provide an absolute pathname to the --with-linux= option." >&2;}
-@@ -4028,16 +4705,17 @@
+@@ -4026,16 +4703,17 @@
  
  else
    LINUX=/usr/src/linux
@@ -56275,7 +57229,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX"; then
-@@ -4046,8 +4724,9 @@
+@@ -4044,8 +4722,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -56287,7 +57241,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -4058,33 +4737,33 @@
+@@ -4056,33 +4735,33 @@
  
  
  # -------- linux objects (for 2.6) --
@@ -56335,7 +57289,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${lb_cv_file__boot_kernel_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4094,13 +4773,13 @@
+@@ -4092,13 +4771,13 @@
    lb_cv_file__boot_kernel_h=no
  fi
  fi
@@ -56353,7 +57307,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${lb_cv_file__var_adm_running_kernel_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4110,8 +4789,8 @@
+@@ -4108,8 +4787,8 @@
    lb_cv_file__var_adm_running_kernel_h=no
  fi
  fi
@@ -56364,7 +57318,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test $lb_cv_file__var_adm_running_kernel_h = yes; then
    KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h'
  fi
-@@ -4120,17 +4799,17 @@
+@@ -4118,17 +4797,17 @@
  
  
  
@@ -56389,7 +57343,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX_CONFIG"; then
-@@ -4139,8 +4818,9 @@
+@@ -4137,8 +4816,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -56401,7 +57355,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -4155,9 +4835,9 @@
+@@ -4153,9 +4833,9 @@
  # and at more old has only one line
  # include <autoconf.h>
  as_lb_File=`echo "lb_cv_file_$LINUX_OBJ/include/linux/autoconf.h" | $as_tr_sh`
@@ -56414,7 +57368,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX_OBJ/include/linux/autoconf.h"; then
-@@ -4166,8 +4846,9 @@
+@@ -4164,8 +4844,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -56426,7 +57380,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -4177,9 +4858,9 @@
+@@ -4175,9 +4856,9 @@
  fi
  
  as_lb_File=`echo "lb_cv_file_$LINUX_OBJ/include/linux/version.h" | $as_tr_sh`
@@ -56439,7 +57393,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX_OBJ/include/linux/version.h"; then
-@@ -4188,8 +4869,9 @@
+@@ -4186,8 +4867,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -56451,7 +57405,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    :
  else
-@@ -4211,9 +4893,9 @@
+@@ -4209,9 +4891,9 @@
  	# enable extensive workarounds to get this to build
  	# modules
  	as_lb_File=`echo "lb_cv_file_$KERNEL_SOURCE_HEADER" | $as_tr_sh`
@@ -56464,7 +57418,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$KERNEL_SOURCE_HEADER"; then
-@@ -4222,8 +4904,9 @@
+@@ -4220,8 +4902,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -56476,7 +57430,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    if test $KERNEL_SOURCE_HEADER = '/boot/kernel.h' ; then
  			{ echo "$as_me:$LINENO: WARNING: Using /boot/kernel.h from RUNNING kernel." >&5
-@@ -4246,30 +4929,30 @@
+@@ -4244,30 +4927,30 @@
  ARCH_UM=
  UML_CFLAGS=
  
@@ -56518,7 +57472,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX/include/linux/namei.h"; then
-@@ -4278,8 +4961,9 @@
+@@ -4276,8 +4959,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -56530,7 +57484,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
  
          	linux25="yes"
-@@ -4292,16 +4976,16 @@
+@@ -4290,16 +4974,16 @@
  
  fi
  
@@ -56553,7 +57507,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  	rm -f build/conftest.i
  	cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
-@@ -4332,8 +5016,8 @@
+@@ -4330,8 +5014,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -56564,7 +57518,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -4371,8 +5055,8 @@
+@@ -4369,8 +5053,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -56575,7 +57529,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -4398,8 +5082,8 @@
+@@ -4396,8 +5080,8 @@
  
  
  # --- check that we can build modules at all
@@ -56586,7 +57540,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4429,16 +5113,16 @@
+@@ -4427,16 +5111,16 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -56607,7 +57561,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  	{ echo "$as_me:$LINENO: WARNING: Consult config.log for details." >&5
  echo "$as_me: WARNING: Consult config.log for details." >&2;}
  	{ echo "$as_me:$LINENO: WARNING: If you are trying to build with a kernel-source rpm, consult build/README.kernel-source" >&5
-@@ -4452,8 +5136,8 @@
+@@ -4450,8 +5134,8 @@
  
  LINUXRELEASE=
  rm -f build/conftest.i
@@ -56618,7 +57572,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test -s $LINUX_OBJ/include/linux/utsrelease.h ; then
  	LINUXRELEASEHEADER=utsrelease.h
  else
-@@ -4505,8 +5189,8 @@
+@@ -4503,8 +5187,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -56629,7 +57583,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  	{ { echo "$as_me:$LINENO: error: Could not preprocess test program.  Consult config.log for details." >&5
  echo "$as_me: error: Could not preprocess test program.  Consult config.log for details." >&2;}
     { (exit 1); exit 1; }; }
-@@ -4515,14 +5199,14 @@
+@@ -4513,14 +5197,14 @@
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  rm -f build/conftest.i
  if test x$LINUXRELEASE = x ; then
@@ -56648,7 +57602,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  
  moduledir='/lib/modules/'$LINUXRELEASE/kernel
-@@ -4535,16 +5219,16 @@
+@@ -4533,16 +5217,16 @@
  
  
  # ------------ RELEASE --------------------------------
@@ -56671,7 +57625,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4582,22 +5266,22 @@
+@@ -4580,22 +5264,22 @@
  
  		RHEL_KENEL="yes"
  		RHEL_KERNEL="yes"
@@ -56700,7 +57654,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4633,8 +5317,8 @@
+@@ -4631,8 +5315,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -56711,7 +57665,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  SUSE_KERNEL="yes"
  
  else
-@@ -4642,8 +5326,8 @@
+@@ -4640,8 +5324,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -56722,7 +57676,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  
  fi
-@@ -4652,14 +5336,14 @@
+@@ -4650,14 +5334,14 @@
  
  
  
@@ -56741,7 +57695,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  else
    { { echo "$as_me:$LINENO: error: Could not determine the kernel architecture." >&5
  echo "$as_me: error: Could not determine the kernel architecture." >&2;}
-@@ -4667,21 +5351,21 @@
+@@ -4665,21 +5349,21 @@
  fi
  
            rm -f build/arch
@@ -56769,7 +57723,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4717,8 +5401,8 @@
+@@ -4715,8 +5399,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -56780,7 +57734,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  
  else
-@@ -4726,8 +5410,8 @@
+@@ -4724,8 +5408,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -56791,7 +57745,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  	{ { echo "$as_me:$LINENO: error: module support is required to build Lustre kernel modules." >&5
  echo "$as_me: error: module support is required to build Lustre kernel modules." >&2;}
-@@ -4738,8 +5422,8 @@
+@@ -4736,8 +5420,8 @@
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  
  
@@ -56802,7 +57756,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4775,8 +5459,8 @@
+@@ -4773,8 +5457,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -56813,7 +57767,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  
  else
-@@ -4784,16 +5468,16 @@
+@@ -4782,16 +5466,16 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -56834,7 +57788,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4829,8 +5513,8 @@
+@@ -4827,8 +5511,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -56845,7 +57799,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  
  else
-@@ -4838,8 +5522,8 @@
+@@ -4836,8 +5520,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -56856,7 +57810,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  if test "x$ARCH_UM" = "x" ; then
  	{ { echo "$as_me:$LINENO: error: Lustre requires that CONFIG_KALLSYMS is enabled in your kernel." >&5
-@@ -4852,8 +5536,8 @@
+@@ -4850,8 +5534,8 @@
  rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
  
  
@@ -56867,7 +57821,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  cat >conftest.c <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4889,8 +5573,8 @@
+@@ -4887,8 +5571,8 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -56878,7 +57832,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  
  else
-@@ -4898,8 +5582,8 @@
+@@ -4896,8 +5580,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -56889,7 +57843,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  	{ echo "$as_me:$LINENO: WARNING: " >&5
  echo "$as_me: WARNING: " >&2;}
-@@ -4918,14 +5602,13 @@
+@@ -4916,14 +5600,13 @@
  # it's ugly to be doing anything with OFED outside of the lnet module, but
  # this has to be done here so that the backports path is set before all of
  # the LN_PROG_LINUX checks are done
@@ -56908,7 +57862,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  		case $with_o2ib in
  		yes)    O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
  			ENABLEO2IB=2
-@@ -4942,10 +5625,11 @@
+@@ -4940,10 +5623,11 @@
  		O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
  		ENABLEO2IB=1
  
@@ -56923,7 +57877,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  else
  	o2ib_found=false
  	for O2IBPATH in $O2IBPATHS; do
-@@ -4958,8 +5642,8 @@
+@@ -4956,8 +5640,8 @@
  		fi
  	done
  	if ! $o2ib_found; then
@@ -56934,7 +57888,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  		case $ENABLEO2IB in
  			1) ;;
  			2) { { echo "$as_me:$LINENO: error: kernel OpenIB gen2 headers not present" >&5
-@@ -4981,11 +5665,11 @@
+@@ -4979,11 +5663,11 @@
  		if test -n "$BACKPORT_INCLUDES"; then
  			OFED_BACKPORT_PATH=`echo $BACKPORT_INCLUDES | sed "s#.*/src/ofa_kernel/#$O2IBPATH/#"`
  			EXTRA_LNET_INCLUDE="-I$OFED_BACKPORT_PATH $EXTRA_LNET_INCLUDE"
@@ -56950,7 +57904,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
                  fi
  	fi
  fi
-@@ -4995,9 +5679,9 @@
+@@ -4993,9 +5677,9 @@
  
  # Find the modpost utility
  as_lb_File=`echo "lb_cv_file_$LINUX_OBJ/scripts/mod/modpost" | $as_tr_sh`
@@ -56963,7 +57917,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX_OBJ/scripts/mod/modpost"; then
-@@ -5006,15 +5690,16 @@
+@@ -5004,15 +5688,16 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -56985,7 +57939,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -r "$LINUX_OBJ/scripts/modpost"; then
-@@ -5023,8 +5708,9 @@
+@@ -5021,8 +5706,9 @@
    eval "$as_lb_File=no"
  fi
  fi
@@ -56997,7 +57951,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test `eval echo '${'$as_lb_File'}'` = yes; then
    MODPOST=$LINUX_OBJ/scripts/modpost
  else
-@@ -5040,11 +5726,11 @@
+@@ -5038,11 +5724,11 @@
  
  
  # Ensure it can run
@@ -57013,7 +57967,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  else
  	{ { echo "$as_me:$LINENO: error: modpost can not be run." >&5
  echo "$as_me: error: modpost can not be run." >&2;}
-@@ -5052,15 +5738,15 @@
+@@ -5050,15 +5736,15 @@
  fi
  
  # Check if modpost supports (and therefore requires) -m
@@ -57035,7 +57989,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  	MODPOST_ARGS=""
  fi
  
-@@ -5120,22 +5806,22 @@
+@@ -5118,22 +5804,22 @@
  LDISKFSDIR="$PWD/ldiskfs"
  
  
@@ -57068,7 +58022,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_path_PATCH+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5150,36 +5836,37 @@
+@@ -5148,36 +5834,37 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -57114,7 +58068,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  if test "${ac_cv_path_QUILT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5194,28 +5881,29 @@
+@@ -5192,28 +5879,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -57150,41 +58104,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  fi
  
  if test x$enable_ldiskfs$PATCH$QUILT = xyesnono ; then
-@@ -5279,16 +5967,16 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking whether to build ldiskfs based on ext4" >&5
--echo $ECHO_N "checking whether to build ldiskfs based on ext4... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to build ldiskfs based on ext4" >&5
-+echo $ECHO_N "checking whether to build ldiskfs based on ext4... $ECHO_C" >&6; }
- if test x$RHEL_KERNEL = xyes; then
--	# Check whether --enable-ext4 or --disable-ext4 was given.
-+	# Check whether --enable-ext4 was given.
- if test "${enable_ext4+set}" = set; then
--  enableval="$enable_ext4"
--
-+  enableval=$enable_ext4;
- else
-   enable_ext4='no'
--fi;
-+fi
-+
- else
- 	case $LINUXRELEASE in
- 	# ext4 was in 2.6.22-2.6.26 but not stable enough to use
-@@ -5301,8 +5989,8 @@
-  ;;
- 	esac
- fi
--echo "$as_me:$LINENO: result: $enable_ext4" >&5
--echo "${ECHO_T}$enable_ext4" >&6
-+{ echo "$as_me:$LINENO: result: $enable_ext4" >&5
-+echo "${ECHO_T}$enable_ext4" >&6; }
- 
- if test x$enable_ext4 = xyes ; then
- 
-@@ -5330,8 +6018,8 @@
+@@ -5297,8 +5985,8 @@
  fi
  
  
@@ -57195,7 +58115,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  case $LINUXRELEASE in
  2.6.5*) LDISKFS_SERIES="2.6-suse.series" ;;
  2.6.9*) LDISKFS_SERIES="2.6-rhel4.series" ;;
-@@ -5348,22 +6036,26 @@
+@@ -5315,22 +6003,26 @@
  		        LDISKFS_SERIES="2.6-rhel5.series"
                  fi
  	else
@@ -57226,7 +58146,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  grep -q -E '[[:space:]]d_rehash_cond[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -5377,12 +6069,12 @@
+@@ -5344,12 +6036,12 @@
  	fi
      done
      if test $export -eq 0; then
@@ -57243,7 +58163,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_D_REHASH_COND 1
-@@ -5390,8 +6082,8 @@
+@@ -5357,8 +6049,8 @@
  
      fi
  else
@@ -57254,7 +58174,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_D_REHASH_COND 1
-@@ -5400,8 +6092,8 @@
+@@ -5367,8 +6059,8 @@
  fi
  
  
@@ -57265,7 +58185,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  grep -q -E '[[:space:]]__d_rehash[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -5415,12 +6107,12 @@
+@@ -5382,12 +6074,12 @@
  	fi
      done
      if test $export -eq 0; then
@@ -57282,7 +58202,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE___D_REHASH 1
-@@ -5428,8 +6120,8 @@
+@@ -5395,8 +6087,8 @@
  
      fi
  else
@@ -57293,7 +58213,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE___D_REHASH 1
-@@ -5438,8 +6130,8 @@
+@@ -5405,8 +6097,8 @@
  fi
  
  
@@ -57304,7 +58224,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  grep -q -E '[[:space:]]d_move_locked[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -5453,12 +6145,12 @@
+@@ -5420,12 +6112,12 @@
  	fi
      done
      if test $export -eq 0; then
@@ -57321,7 +58241,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_D_MOVE_LOCKED 1
-@@ -5466,8 +6158,8 @@
+@@ -5433,8 +6125,8 @@
  
      fi
  else
@@ -57332,7 +58252,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_D_MOVE_LOCKED 1
-@@ -5476,8 +6168,8 @@
+@@ -5443,8 +6135,8 @@
  fi
  
  
@@ -57343,7 +58263,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  grep -q -E '[[:space:]]__d_move[[:space:]]' $LINUX/$SYMVERFILE 2>/dev/null
  rc=$?
  if test $rc -ne 0; then
-@@ -5491,12 +6183,12 @@
+@@ -5458,12 +6150,12 @@
  	fi
      done
      if test $export -eq 0; then
@@ -57360,7 +58280,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE___D_MOVE 1
-@@ -5504,8 +6196,8 @@
+@@ -5471,8 +6163,8 @@
  
      fi
  else
@@ -57371,7 +58291,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE___D_MOVE 1
-@@ -5542,39 +6234,58 @@
+@@ -5509,39 +6201,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -57444,7 +58364,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    fi
  fi
  rm -f confcache
-@@ -5583,32 +6294,18 @@
+@@ -5550,32 +6261,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -57483,7 +58403,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  done
  LIBOBJS=$ac_libobjs
  
-@@ -5695,73 +6392,26 @@
+@@ -5662,73 +6359,26 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
@@ -57504,8 +58424,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
 -# Support unset when possible.
 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 -  as_unset=unset
-+  setopt NO_GLOB_SUBST
- else
+-else
 -  as_unset=false
 -fi
 -
@@ -57515,10 +58434,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
 -PS1='$ '
 -PS2='> '
 -PS4='+ '
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
- 
+-
 -# NLS nuisances.
 -for as_var in \
 -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
@@ -57529,21 +58445,25 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
 -    eval $as_var=C; export $as_var
 -  else
 -    $as_unset $as_var
-   fi
+-  fi
 -done
- 
+-
 -# Required to use basename.
 -if expr a : '\(a\)' >/dev/null 2>&1; then
 -  as_expr=expr
--else
++  setopt NO_GLOB_SUBST
+ else
 -  as_expr=false
 -fi
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
  
 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
 -  as_basename=basename
 -else
 -  as_basename=false
--fi
+ fi
  
  
 -# Name of the executable.
@@ -57557,14 +58477,14 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
 -  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
--
--
+ 
+ 
 -# PATH needs CR, and LINENO needs CR and PATH.
 +# PATH needs CR
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -5782,14 +6432,24 @@
+@@ -5749,14 +6399,24 @@
    rm -f conf$$.sh
  fi
  
@@ -57596,7 +58516,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    case $0 in
      *[\\/]* ) as_myself=$0 ;;
      *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5799,6 +6459,7 @@
+@@ -5766,6 +6426,7 @@
    test -z "$as_dir" && as_dir=.
    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  done
@@ -57604,7 +58524,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
         ;;
    esac
-@@ -5808,100 +6469,161 @@
+@@ -5775,100 +6436,161 @@
      as_myself=$0
    fi
    if test ! -f "$as_myself"; then
@@ -57821,7 +58741,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -5910,7 +6632,28 @@
+@@ -5877,7 +6599,28 @@
    as_mkdir_p=false
  fi
  
@@ -57851,7 +58771,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -5919,31 +6662,14 @@
+@@ -5886,31 +6629,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -57887,7 +58807,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -5951,30 +6677,20 @@
+@@ -5918,30 +6644,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -57926,7 +58846,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -5982,7 +6698,7 @@
+@@ -5949,7 +6665,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -57935,7 +58855,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -6001,19 +6717,21 @@
+@@ -5968,19 +6684,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -57963,7 +58883,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -6024,39 +6742,24 @@
+@@ -5991,39 +6709,24 @@
  do
    case $1 in
    --*=*)
@@ -58009,7 +58929,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -6066,18 +6769,24 @@
+@@ -6033,18 +6736,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -58039,7 +58959,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
    esac
    shift
-@@ -6093,42 +6802,54 @@
+@@ -6060,42 +6769,54 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -58104,7 +59024,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -6140,378 +6861,485 @@
+@@ -6107,378 +6828,485 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -58895,7 +59815,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -6519,248 +7347,130 @@
+@@ -6486,248 +7314,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -59241,7 +60161,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -6771,135 +7481,39 @@
+@@ -6738,135 +7448,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -59401,7 +60321,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -6909,17 +7523,28 @@
+@@ -6876,17 +7490,28 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -59437,7 +60357,7 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
    	  s/.*/./; q'`
    else
      continue
-@@ -6948,53 +7573,79 @@
+@@ -6915,53 +7540,79 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -59544,9 +60464,25 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/configure lustre-1.8.1/ldiskfs/configure
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -Nurwd lustre-1.8.1.orig/ldiskfs/ldiskfs/autoMakefile.in lustre-1.8.1/ldiskfs/ldiskfs/autoMakefile.in
---- lustre-1.8.1.orig/ldiskfs/ldiskfs/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/ldiskfs/ldiskfs/autoMakefile.in	2009-09-10 11:17:19.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/configure.ac lustre-1.8.2/ldiskfs/configure.ac
+--- orig/lustre-1.8.2/ldiskfs/configure.ac	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/configure.ac	2010-03-03 15:57:14.803634020 +0000
+@@ -113,8 +113,12 @@
+ 		        LDISKFS_SERIES="2.6-rhel5.series"
+                 fi
+ 	else
++	    if test -e $LINUX_OBJ/version.Debian; then
++		LDISKFS_SERIES="2.6.18-debian.series"
++	    else
+ 		LDISKFS_SERIES="2.6.18-vanilla.series"
+ 	fi
++	fi
+ 	;;
+ 2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
+ 2.6.27*) LDISKFS_SERIES="2.6-sles11.series";;
+diff -Nurwd orig/lustre-1.8.2/ldiskfs/ldiskfs/autoMakefile.in lustre-1.8.2/ldiskfs/ldiskfs/autoMakefile.in
+--- orig/lustre-1.8.2/ldiskfs/ldiskfs/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/ldiskfs/ldiskfs/autoMakefile.in	2010-03-03 16:00:18.803633117 +0000
 @@ -65,6 +65,7 @@
  EGREP = @EGREP@
  EXEEXT = @EXEEXT@
@@ -59599,9 +60535,1831 @@ diff -Nurwd lustre-1.8.1.orig/ldiskfs/ldiskfs/autoMakefile.in lustre-1.8.1/ldisk
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-diff -Nurwd lustre-1.8.1.orig/libsysio/aclocal.m4 lustre-1.8.1/libsysio/aclocal.m4
---- lustre-1.8.1.orig/libsysio/aclocal.m4	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/libsysio/aclocal.m4	2009-09-10 11:17:08.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/libsysio/Makefile.in lustre-1.8.2/libsysio/Makefile.in
+--- orig/lustre-1.8.2/libsysio/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/libsysio/Makefile.in	2010-03-03 16:00:16.696633475 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -26,6 +26,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = .
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -42,107 +43,6 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Rules.make \
+-	$(top_srcdir)/configure $(top_srcdir)/dev/stdfd/module.mk \
+-	$(top_srcdir)/drivers/incore/module.mk \
+-	$(top_srcdir)/drivers/native/module.mk \
+-	$(top_srcdir)/drivers/sockets/module.mk \
+-	$(top_srcdir)/drivers/yod/module.mk \
+-	$(top_srcdir)/include/module.mk $(top_srcdir)/src/module.mk \
+-	$(top_srcdir)/tests/module.mk AUTHORS COPYING ChangeLog \
+-	INSTALL NEWS compile config.guess config.sub depcomp \
+-	install-sh missing mkinstalldirs
+-subdir = .
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+-    *) f=$$p;; \
+-  esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLIBRARIES_INSTALL = $(INSTALL_DATA)
+-LIBRARIES = $(lib_LIBRARIES)
+-AR = ar
+-ARFLAGS = cru
+-__LIBBUILD_DIR__libsysio_a_AR = $(AR) $(ARFLAGS)
+-__LIBBUILD_DIR__libsysio_a_LIBADD =
+-am____LIBBUILD_DIR__libsysio_a_SOURCES_DIST = src/access.c src/chdir.c \
+-	src/chmod.c src/chown.c src/dev.c src/dup.c src/fcntl.c \
+-	src/fs.c src/fsync.c src/getdirentries.c src/init.c \
+-	src/inode.c src/ioctl.c src/ioctx.c src/iowait.c src/link.c \
+-	src/lseek.c src/mkdir.c src/mknod.c src/mount.c src/namei.c \
+-	src/open.c src/rw.c src/reconcile.c src/rename.c src/rmdir.c \
+-	src/stat64.c src/stat.c src/stddir.c src/readdir.c \
+-	src/readdir64.c src/symlink.c src/readlink.c src/truncate.c \
+-	src/unlink.c src/utime.c src/file.c src/file_hack.c \
+-	src/stdlib.c dev/stdfd/stdfd.c drivers/incore/fs_incore.c \
+-	drivers/sockets/sockets.c drivers/native/fs_native.c \
+-	drivers/yod/fs_yod.c
+-am__dirstamp = $(am__leading_dot)dirstamp
+- at WITH_LUSTRE_HACK_FALSE@am__objects_1 = src/file.$(OBJEXT)
+- at WITH_LUSTRE_HACK_TRUE@am__objects_1 = src/file_hack.$(OBJEXT)
+- at WITH_LUSTRE_HACK_TRUE@am__objects_2 = src/stdlib.$(OBJEXT)
+-am__objects_3 = src/access.$(OBJEXT) src/chdir.$(OBJEXT) \
+-	src/chmod.$(OBJEXT) src/chown.$(OBJEXT) src/dev.$(OBJEXT) \
+-	src/dup.$(OBJEXT) src/fcntl.$(OBJEXT) src/fs.$(OBJEXT) \
+-	src/fsync.$(OBJEXT) src/getdirentries.$(OBJEXT) \
+-	src/init.$(OBJEXT) src/inode.$(OBJEXT) src/ioctl.$(OBJEXT) \
+-	src/ioctx.$(OBJEXT) src/iowait.$(OBJEXT) src/link.$(OBJEXT) \
+-	src/lseek.$(OBJEXT) src/mkdir.$(OBJEXT) src/mknod.$(OBJEXT) \
+-	src/mount.$(OBJEXT) src/namei.$(OBJEXT) src/open.$(OBJEXT) \
+-	src/rw.$(OBJEXT) src/reconcile.$(OBJEXT) src/rename.$(OBJEXT) \
+-	src/rmdir.$(OBJEXT) src/stat64.$(OBJEXT) src/stat.$(OBJEXT) \
+-	src/stddir.$(OBJEXT) src/readdir.$(OBJEXT) \
+-	src/readdir64.$(OBJEXT) src/symlink.$(OBJEXT) \
+-	src/readlink.$(OBJEXT) src/truncate.$(OBJEXT) \
+-	src/unlink.$(OBJEXT) src/utime.$(OBJEXT) $(am__objects_1) \
+-	$(am__objects_2)
+-am__objects_4 = dev/stdfd/stdfd.$(OBJEXT)
+- at WITH_STDFD_DEV_TRUE@am__objects_5 = $(am__objects_4)
+-am__objects_6 = drivers/incore/fs_incore.$(OBJEXT)
+- at WITH_INCORE_DRIVER_TRUE@am__objects_7 = $(am__objects_6)
+-am__objects_8 = drivers/sockets/sockets.$(OBJEXT)
+- at WITH_SOCKETS_DRIVER_TRUE@am__objects_9 = $(am__objects_8)
+-am__objects_10 = drivers/native/fs_native.$(OBJEXT)
+- at WITH_NATIVE_DRIVER_TRUE@am__objects_11 = $(am__objects_10)
+- at WITH_CPLANT_YOD_TRUE@am__objects_12 = drivers/yod/fs_yod.$(OBJEXT)
+- at WITH_CPLANT_YOD_TRUE@am__objects_13 = $(am__objects_12)
+-am___LIBBUILD_DIR__libsysio_a_OBJECTS = $(am__objects_3) \
+-	$(am__objects_5) $(am__objects_7) $(am__objects_9) \
+-	$(am__objects_11) $(am__objects_13)
+-__LIBBUILD_DIR__libsysio_a_OBJECTS =  \
+-	$(am___LIBBUILD_DIR__libsysio_a_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(__LIBBUILD_DIR__libsysio_a_SOURCES)
+-DIST_SOURCES = $(am____LIBBUILD_DIR__libsysio_a_SOURCES_DIST)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-distdir = $(PACKAGE)-$(VERSION)
+-top_distdir = $(distdir)
+-am__remove_distdir = \
+-  { test ! -d $(distdir) \
+-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+-         && rm -fr $(distdir); }; }
+-DIST_ARCHIVES = $(distdir).tar.gz
+-GZIP_ENV = --best
+-distuninstallcheck_listfiles = find . -type f -print
+-distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -166,6 +66,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++GREP = @GREP@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -211,15 +112,11 @@
+ WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ ZERO_SUM_MEMORY = @ZERO_SUM_MEMORY@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -227,23 +124,29 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -253,12 +156,16 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = 1.6
+- at WITH_TESTS_FALSE@TESTDIR = 
++
+ @WITH_TESTS_TRUE at TESTDIR = tests
+- at WITH_LUSTRE_HACK_FALSE@FILE_SUPPORT = src/file.c
++ at WITH_TESTS_FALSE@TESTDIR = 
++
+ @WITH_LUSTRE_HACK_TRUE at FILE_SUPPORT = src/file_hack.c
+- at WITH_LUSTRE_HACK_FALSE@LUSTRE_SRCDIR_SRCS = 
++ at WITH_LUSTRE_HACK_FALSE@FILE_SUPPORT = src/file.c
++
+ @WITH_LUSTRE_HACK_TRUE at LUSTRE_SRCDIR_SRCS = src/stdlib.c
++ at WITH_LUSTRE_HACK_FALSE@LUSTRE_SRCDIR_SRCS = 
++
+ SRCDIR_SRCS = src/access.c src/chdir.c src/chmod.c \
+ 	src/chown.c src/dev.c src/dup.c src/fcntl.c \
+ 	src/fs.c src/fsync.c \
+@@ -273,6 +180,7 @@
+ 	src/truncate.c src/unlink.c src/utime.c \
+ 	$(FILE_SUPPORT) $(LUSTRE_SRCDIR_SRCS)
+ 
++
+ SRCDIR_EXTRA = src/module.mk
+ INCLUDE_EXTRA = include/dev.h include/file.h include/fs.h \
+ 	include/inode.h include/mount.h include/sysio.h include/sysio-cmn.h \
+@@ -298,21 +206,29 @@
+ YOD_EXTRA = include/cplant-yod.h drivers/yod/fs_yod.h drivers/yod/module.mk
+ SOCKETS_SRCS = drivers/sockets/sockets.c
+ SOCKETS_EXTRA = drivers/sockets/module.mk
++
+ lib_LIBRARIES = ${LIBBUILD_DIR}/libsysio.a
+ @WITH_STDFD_DEV_FALSE at OPTIONAL_STDFD_SRCS = 
++
+ @WITH_STDFD_DEV_TRUE at OPTIONAL_STDFD_SRCS = $(STDFD_SRCS)
+ @WITH_INCORE_DRIVER_FALSE at OPTIONAL_INCORE_SRCS = 
++
+ @WITH_INCORE_DRIVER_TRUE at OPTIONAL_INCORE_SRCS = $(INCORE_SRCS)
+- at WITH_NATIVE_DRIVER_FALSE@OPTIONAL_NATIVE_SRCS = 
++
+ @WITH_NATIVE_DRIVER_TRUE at OPTIONAL_NATIVE_SRCS = $(NATIVE_SRCS)
++ at WITH_NATIVE_DRIVER_FALSE@OPTIONAL_NATIVE_SRCS = 
+ @WITH_SOCKETS_DRIVER_FALSE at OPTIONAL_SOCKETS_SRCS = 
++
+ @WITH_SOCKETS_DRIVER_TRUE at OPTIONAL_SOCKETS_SRCS = $(SOCKETS_SRCS)
+ @WITH_CPLANT_YOD_FALSE at OPTIONAL_YOD_SRCS = 
++
+ @WITH_CPLANT_YOD_TRUE at OPTIONAL_YOD_SRCS = $(YOD_SRCS)
+ 
+ # it would be better that let configure script check this
+ @WITH_LUSTRE_HACK_TRUE at OPTIONAL_LUSTRE_CFLAGS = -fPIC
++
+ AM_CFLAGS = $(OPTIONAL_LUSTRE_CFLAGS)
++
+ __LIBBUILD_DIR__libsysio_a_SOURCES = \
+ 	$(SRCDIR_SRCS) \
+ 	$(OPTIONAL_STDFD_SRCS) \
+@@ -324,90 +240,188 @@
+ @WITH_STDFD_DEV_TRUE at STDFD_DEV_CPPFLAGS = -DSTDFD_DEV=1 -I$(top_srcdir)/dev/stdfd
+ @WITH_STDFD_DEV_FALSE at STFD_DEV_CPPFLAGS = 
+ @WITH_SOCKETS_DRIVER_FALSE at SOCKETS_CPPFLAGS = 
++
+ @WITH_SOCKETS_DRIVER_TRUE at SOCKETS_CPPFLAGS = -DWITH_SOCKETS=1
++
+ DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS)
+-AM_CPPFLAGS = $(TRACING) $(AUTOMOUNT) $(ZERO_SUM_MEMORY) \
+-	$(DEV_CPPFLAGS) $(SOCKETS_CPPFLAGS) $(DEFER_INIT_CWD) \
+-	$(SYSIO_LABEL_NAMES) -I$(top_srcdir)/include \
++
++AM_CPPFLAGS = \
++	$(TRACING) \
++	$(AUTOMOUNT) $(ZERO_SUM_MEMORY) $(DEV_CPPFLAGS) $(SOCKETS_CPPFLAGS) \
++	$(DEFER_INIT_CWD) $(SYSIO_LABEL_NAMES) -I$(top_srcdir)/include \
+ 	${YOD_DRIVER_FLAGS}
++
+ EXTRA_DIST = Rules.make misc/init-env.sh $(TESTS_EXTRA) $(SRCDIR_EXTRA) \
+ 	$(INCLUDE_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \
+ 	$(SOCKETS_EXTRA) $(NATIVE_EXTRA) $(YOD_EXTRA)
+ 
++subdir = .
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_CLEAN_FILES =
++LIBRARIES = $(lib_LIBRARIES)
++
++__LIBBUILD_DIR__libsysio_a_AR = $(AR) cru
++__LIBBUILD_DIR__libsysio_a_LIBADD =
++am____LIBBUILD_DIR__libsysio_a_SOURCES_DIST = src/access.c src/chdir.c \
++	src/chmod.c src/chown.c src/dev.c src/dup.c src/fcntl.c \
++	src/fs.c src/fsync.c src/getdirentries.c src/init.c src/inode.c \
++	src/ioctl.c src/ioctx.c src/iowait.c src/link.c src/lseek.c \
++	src/mkdir.c src/mknod.c src/mount.c src/namei.c src/open.c \
++	src/rw.c src/reconcile.c src/rename.c src/rmdir.c src/stat64.c \
++	src/stat.c src/stddir.c src/readdir.c src/readdir64.c \
++	src/symlink.c src/readlink.c src/truncate.c src/unlink.c \
++	src/utime.c src/file_hack.c src/file.c src/stdlib.c \
++	dev/stdfd/stdfd.c drivers/incore/fs_incore.c \
++	drivers/sockets/sockets.c drivers/native/fs_native.c \
++	drivers/yod/fs_yod.c
++am__dirstamp = $(am__leading_dot)dirstamp
++ at WITH_LUSTRE_HACK_TRUE@am__objects_1 = src/file_hack.$(OBJEXT)
++ at WITH_LUSTRE_HACK_FALSE@am__objects_1 = src/file.$(OBJEXT)
++ at WITH_LUSTRE_HACK_TRUE@am__objects_2 = src/stdlib.$(OBJEXT)
++ at WITH_LUSTRE_HACK_FALSE@am__objects_2 =
++am__objects_3 = src/access.$(OBJEXT) src/chdir.$(OBJEXT) \
++	src/chmod.$(OBJEXT) src/chown.$(OBJEXT) src/dev.$(OBJEXT) \
++	src/dup.$(OBJEXT) src/fcntl.$(OBJEXT) src/fs.$(OBJEXT) \
++	src/fsync.$(OBJEXT) src/getdirentries.$(OBJEXT) \
++	src/init.$(OBJEXT) src/inode.$(OBJEXT) src/ioctl.$(OBJEXT) \
++	src/ioctx.$(OBJEXT) src/iowait.$(OBJEXT) src/link.$(OBJEXT) \
++	src/lseek.$(OBJEXT) src/mkdir.$(OBJEXT) src/mknod.$(OBJEXT) \
++	src/mount.$(OBJEXT) src/namei.$(OBJEXT) src/open.$(OBJEXT) \
++	src/rw.$(OBJEXT) src/reconcile.$(OBJEXT) src/rename.$(OBJEXT) \
++	src/rmdir.$(OBJEXT) src/stat64.$(OBJEXT) src/stat.$(OBJEXT) \
++	src/stddir.$(OBJEXT) src/readdir.$(OBJEXT) \
++	src/readdir64.$(OBJEXT) src/symlink.$(OBJEXT) \
++	src/readlink.$(OBJEXT) src/truncate.$(OBJEXT) \
++	src/unlink.$(OBJEXT) src/utime.$(OBJEXT) $(am__objects_1) \
++	$(am__objects_2)
++am__objects_4 = dev/stdfd/stdfd.$(OBJEXT)
++ at WITH_STDFD_DEV_TRUE@am__objects_5 = $(am__objects_4)
++ at WITH_STDFD_DEV_FALSE@am__objects_5 =
++am__objects_6 = drivers/incore/fs_incore.$(OBJEXT)
++ at WITH_INCORE_DRIVER_TRUE@am__objects_7 = $(am__objects_6)
++ at WITH_INCORE_DRIVER_FALSE@am__objects_7 =
++am__objects_8 = drivers/sockets/sockets.$(OBJEXT)
++ at WITH_SOCKETS_DRIVER_TRUE@am__objects_9 = $(am__objects_8)
++ at WITH_SOCKETS_DRIVER_FALSE@am__objects_9 =
++am__objects_10 = drivers/native/fs_native.$(OBJEXT)
++ at WITH_NATIVE_DRIVER_TRUE@am__objects_11 = $(am__objects_10)
++ at WITH_NATIVE_DRIVER_FALSE@am__objects_11 =
++ at WITH_CPLANT_YOD_TRUE@am__objects_12 = drivers/yod/fs_yod.$(OBJEXT)
++ at WITH_CPLANT_YOD_FALSE@am__objects_12 =
++ at WITH_CPLANT_YOD_TRUE@am__objects_13 = $(am__objects_12)
++ at WITH_CPLANT_YOD_FALSE@am__objects_13 =
++am___LIBBUILD_DIR__libsysio_a_OBJECTS = $(am__objects_3) \
++	$(am__objects_5) $(am__objects_7) $(am__objects_9) \
++	$(am__objects_11) $(am__objects_13)
++__LIBBUILD_DIR__libsysio_a_OBJECTS = \
++	$(am___LIBBUILD_DIR__libsysio_a_OBJECTS)
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++ at AMDEP_TRUE@DEP_FILES = dev/stdfd/$(DEPDIR)/stdfd.Po \
++ at AMDEP_TRUE@	drivers/incore/$(DEPDIR)/fs_incore.Po \
++ at AMDEP_TRUE@	drivers/native/$(DEPDIR)/fs_native.Po \
++ at AMDEP_TRUE@	drivers/sockets/$(DEPDIR)/sockets.Po \
++ at AMDEP_TRUE@	drivers/yod/$(DEPDIR)/fs_yod.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/access.Po src/$(DEPDIR)/chdir.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/chmod.Po src/$(DEPDIR)/chown.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/dev.Po src/$(DEPDIR)/dup.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/fcntl.Po src/$(DEPDIR)/file.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/file_hack.Po src/$(DEPDIR)/fs.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/fsync.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/getdirentries.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/init.Po src/$(DEPDIR)/inode.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/ioctl.Po src/$(DEPDIR)/ioctx.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/iowait.Po src/$(DEPDIR)/link.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/lseek.Po src/$(DEPDIR)/mkdir.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/mknod.Po src/$(DEPDIR)/mount.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/namei.Po src/$(DEPDIR)/open.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/readdir.Po src/$(DEPDIR)/readdir64.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/readlink.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/reconcile.Po src/$(DEPDIR)/rename.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/rmdir.Po src/$(DEPDIR)/rw.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/stat.Po src/$(DEPDIR)/stat64.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/stddir.Po src/$(DEPDIR)/stdlib.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/symlink.Po src/$(DEPDIR)/truncate.Po \
++ at AMDEP_TRUE@	src/$(DEPDIR)/unlink.Po src/$(DEPDIR)/utime.Po
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(am____LIBBUILD_DIR__libsysio_a_SOURCES_DIST)
++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \
++	$(top_srcdir)/Rules.make $(top_srcdir)/dev/stdfd/module.mk \
++	$(top_srcdir)/drivers/incore/module.mk \
++	$(top_srcdir)/drivers/native/module.mk \
++	$(top_srcdir)/drivers/sockets/module.mk \
++	$(top_srcdir)/drivers/yod/module.mk \
++	$(top_srcdir)/include/module.mk $(top_srcdir)/src/module.mk \
++	$(top_srcdir)/tests/module.mk AUTHORS COPYING ChangeLog INSTALL \
++	Makefile.am NEWS aclocal.m4 compile config.guess config.sub \
++	configure configure.in depcomp install-sh missing mkinstalldirs
++SOURCES = $(__LIBBUILD_DIR__libsysio_a_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .o .obj
+-am--refresh:
+-	@:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/module.mk $(top_srcdir)/include/module.mk $(top_srcdir)/tests/module.mk $(top_srcdir)/dev/stdfd/module.mk $(top_srcdir)/drivers/incore/module.mk $(top_srcdir)/drivers/native/module.mk $(top_srcdir)/drivers/yod/module.mk $(top_srcdir)/drivers/sockets/module.mk $(top_srcdir)/Rules.make $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
++
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno
++$(srcdir)/Makefile.in:  Makefile.am $(top_srcdir)/src/module.mk $(top_srcdir)/include/module.mk $(top_srcdir)/tests/module.mk $(top_srcdir)/dev/stdfd/module.mk $(top_srcdir)/drivers/incore/module.mk $(top_srcdir)/drivers/native/module.mk $(top_srcdir)/drivers/yod/module.mk $(top_srcdir)/drivers/sockets/module.mk $(top_srcdir)/Rules.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+ 	  $(AUTOMAKE) --gnu  Makefile
+-.PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    echo ' $(SHELL) ./config.status'; \
+-	    $(SHELL) ./config.status;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+-	esac;
++	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+ 
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+-
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ 	cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++
++$(ACLOCAL_M4):  configure.in 
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++
++AR = ar
++libLIBRARIES_INSTALL = $(INSTALL_DATA)
+ install-libLIBRARIES: $(lib_LIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f=$(am__strip_dir) \
+-	    echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    f="`echo $$p | sed -e 's|^.*/||'`"; \
++	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 	@$(POST_INSTALL)
+ 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    p=$(am__strip_dir) \
+-	    echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
+-	    $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
++	    p="`echo $$p | sed -e 's|^.*/||'`"; \
++	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
++	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-libLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+-	  p=$(am__strip_dir) \
+-	  echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  p="`echo $$p | sed -e 's|^.*/||'`"; \
++	  echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLIBRARIES:
+ 	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+ src/$(am__dirstamp):
+-	@$(mkdir_p) src
++	@$(mkinstalldirs) src
+ 	@: > src/$(am__dirstamp)
+ src/$(DEPDIR)/$(am__dirstamp):
+-	@$(mkdir_p) src/$(DEPDIR)
++	@$(mkinstalldirs) src/$(DEPDIR)
+ 	@: > src/$(DEPDIR)/$(am__dirstamp)
+-src/access.$(OBJEXT): src/$(am__dirstamp) \
+-	src/$(DEPDIR)/$(am__dirstamp)
++src/access.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/chdir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/chmod.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/chown.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+@@ -422,8 +436,7 @@
+ src/inode.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/ioctl.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/ioctx.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+-src/iowait.$(OBJEXT): src/$(am__dirstamp) \
+-	src/$(DEPDIR)/$(am__dirstamp)
++src/iowait.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/link.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/lseek.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/mkdir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+@@ -434,74 +447,67 @@
+ src/rw.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/reconcile.$(OBJEXT): src/$(am__dirstamp) \
+ 	src/$(DEPDIR)/$(am__dirstamp)
+-src/rename.$(OBJEXT): src/$(am__dirstamp) \
+-	src/$(DEPDIR)/$(am__dirstamp)
++src/rename.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/rmdir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+-src/stat64.$(OBJEXT): src/$(am__dirstamp) \
+-	src/$(DEPDIR)/$(am__dirstamp)
++src/stat64.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/stat.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+-src/stddir.$(OBJEXT): src/$(am__dirstamp) \
+-	src/$(DEPDIR)/$(am__dirstamp)
+-src/readdir.$(OBJEXT): src/$(am__dirstamp) \
+-	src/$(DEPDIR)/$(am__dirstamp)
++src/stddir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
++src/readdir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/readdir64.$(OBJEXT): src/$(am__dirstamp) \
+ 	src/$(DEPDIR)/$(am__dirstamp)
+-src/symlink.$(OBJEXT): src/$(am__dirstamp) \
+-	src/$(DEPDIR)/$(am__dirstamp)
++src/symlink.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/readlink.$(OBJEXT): src/$(am__dirstamp) \
+ 	src/$(DEPDIR)/$(am__dirstamp)
+ src/truncate.$(OBJEXT): src/$(am__dirstamp) \
+ 	src/$(DEPDIR)/$(am__dirstamp)
+-src/unlink.$(OBJEXT): src/$(am__dirstamp) \
+-	src/$(DEPDIR)/$(am__dirstamp)
++src/unlink.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/utime.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+-src/file.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/file_hack.$(OBJEXT): src/$(am__dirstamp) \
+ 	src/$(DEPDIR)/$(am__dirstamp)
+-src/stdlib.$(OBJEXT): src/$(am__dirstamp) \
+-	src/$(DEPDIR)/$(am__dirstamp)
++src/file.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
++src/stdlib.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ dev/stdfd/$(am__dirstamp):
+-	@$(mkdir_p) dev/stdfd
++	@$(mkinstalldirs) dev/stdfd
+ 	@: > dev/stdfd/$(am__dirstamp)
+ dev/stdfd/$(DEPDIR)/$(am__dirstamp):
+-	@$(mkdir_p) dev/stdfd/$(DEPDIR)
++	@$(mkinstalldirs) dev/stdfd/$(DEPDIR)
+ 	@: > dev/stdfd/$(DEPDIR)/$(am__dirstamp)
+ dev/stdfd/stdfd.$(OBJEXT): dev/stdfd/$(am__dirstamp) \
+ 	dev/stdfd/$(DEPDIR)/$(am__dirstamp)
+ drivers/incore/$(am__dirstamp):
+-	@$(mkdir_p) drivers/incore
++	@$(mkinstalldirs) drivers/incore
+ 	@: > drivers/incore/$(am__dirstamp)
+ drivers/incore/$(DEPDIR)/$(am__dirstamp):
+-	@$(mkdir_p) drivers/incore/$(DEPDIR)
++	@$(mkinstalldirs) drivers/incore/$(DEPDIR)
+ 	@: > drivers/incore/$(DEPDIR)/$(am__dirstamp)
+ drivers/incore/fs_incore.$(OBJEXT): drivers/incore/$(am__dirstamp) \
+ 	drivers/incore/$(DEPDIR)/$(am__dirstamp)
+ drivers/sockets/$(am__dirstamp):
+-	@$(mkdir_p) drivers/sockets
++	@$(mkinstalldirs) drivers/sockets
+ 	@: > drivers/sockets/$(am__dirstamp)
+ drivers/sockets/$(DEPDIR)/$(am__dirstamp):
+-	@$(mkdir_p) drivers/sockets/$(DEPDIR)
++	@$(mkinstalldirs) drivers/sockets/$(DEPDIR)
+ 	@: > drivers/sockets/$(DEPDIR)/$(am__dirstamp)
+ drivers/sockets/sockets.$(OBJEXT): drivers/sockets/$(am__dirstamp) \
+ 	drivers/sockets/$(DEPDIR)/$(am__dirstamp)
+ drivers/native/$(am__dirstamp):
+-	@$(mkdir_p) drivers/native
++	@$(mkinstalldirs) drivers/native
+ 	@: > drivers/native/$(am__dirstamp)
+ drivers/native/$(DEPDIR)/$(am__dirstamp):
+-	@$(mkdir_p) drivers/native/$(DEPDIR)
++	@$(mkinstalldirs) drivers/native/$(DEPDIR)
+ 	@: > drivers/native/$(DEPDIR)/$(am__dirstamp)
+ drivers/native/fs_native.$(OBJEXT): drivers/native/$(am__dirstamp) \
+ 	drivers/native/$(DEPDIR)/$(am__dirstamp)
+ drivers/yod/$(am__dirstamp):
+-	@$(mkdir_p) drivers/yod
++	@$(mkinstalldirs) drivers/yod
+ 	@: > drivers/yod/$(am__dirstamp)
+ drivers/yod/$(DEPDIR)/$(am__dirstamp):
+-	@$(mkdir_p) drivers/yod/$(DEPDIR)
++	@$(mkinstalldirs) drivers/yod/$(DEPDIR)
+ 	@: > drivers/yod/$(DEPDIR)/$(am__dirstamp)
+ drivers/yod/fs_yod.$(OBJEXT): drivers/yod/$(am__dirstamp) \
+ 	drivers/yod/$(DEPDIR)/$(am__dirstamp)
+ ${LIBBUILD_DIR}/$(am__dirstamp):
+-	@$(mkdir_p) ${LIBBUILD_DIR}
++	@$(mkinstalldirs) ${LIBBUILD_DIR}
+ 	@: > ${LIBBUILD_DIR}/$(am__dirstamp)
+ ${LIBBUILD_DIR}/libsysio.a: $(__LIBBUILD_DIR__libsysio_a_OBJECTS) $(__LIBBUILD_DIR__libsysio_a_DEPENDENCIES) ${LIBBUILD_DIR}/$(am__dirstamp)
+ 	-rm -f ${LIBBUILD_DIR}/libsysio.a
+@@ -509,7 +515,7 @@
+ 	$(RANLIB) ${LIBBUILD_DIR}/libsysio.a
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 	-rm -f dev/stdfd/stdfd.$(OBJEXT)
+ 	-rm -f drivers/incore/fs_incore.$(OBJEXT)
+ 	-rm -f drivers/native/fs_native.$(OBJEXT)
+@@ -604,22 +610,1004 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/utime.Po at am__quote@
+ 
+ .c.o:
+- at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
+- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
++ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+- at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
+- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++
++src/access.o: src/access.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/access.o -MD -MP -MF "src/$(DEPDIR)/access.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/access.o `test -f 'src/access.c' || echo '$(srcdir)/'`src/access.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/access.Tpo" "src/$(DEPDIR)/access.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/access.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/access.c' object='src/access.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/access.Po' tmpdepfile='src/$(DEPDIR)/access.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/access.o `test -f 'src/access.c' || echo '$(srcdir)/'`src/access.c
++
++src/access.obj: src/access.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/access.obj -MD -MP -MF "src/$(DEPDIR)/access.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/access.obj `if test -f 'src/access.c'; then $(CYGPATH_W) 'src/access.c'; else $(CYGPATH_W) '$(srcdir)/src/access.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/access.Tpo" "src/$(DEPDIR)/access.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/access.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/access.c' object='src/access.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/access.Po' tmpdepfile='src/$(DEPDIR)/access.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/access.obj `if test -f 'src/access.c'; then $(CYGPATH_W) 'src/access.c'; else $(CYGPATH_W) '$(srcdir)/src/access.c'; fi`
++
++src/chdir.o: src/chdir.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chdir.o -MD -MP -MF "src/$(DEPDIR)/chdir.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/chdir.o `test -f 'src/chdir.c' || echo '$(srcdir)/'`src/chdir.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chdir.Tpo" "src/$(DEPDIR)/chdir.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chdir.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chdir.c' object='src/chdir.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chdir.Po' tmpdepfile='src/$(DEPDIR)/chdir.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chdir.o `test -f 'src/chdir.c' || echo '$(srcdir)/'`src/chdir.c
++
++src/chdir.obj: src/chdir.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chdir.obj -MD -MP -MF "src/$(DEPDIR)/chdir.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/chdir.obj `if test -f 'src/chdir.c'; then $(CYGPATH_W) 'src/chdir.c'; else $(CYGPATH_W) '$(srcdir)/src/chdir.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chdir.Tpo" "src/$(DEPDIR)/chdir.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chdir.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chdir.c' object='src/chdir.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chdir.Po' tmpdepfile='src/$(DEPDIR)/chdir.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chdir.obj `if test -f 'src/chdir.c'; then $(CYGPATH_W) 'src/chdir.c'; else $(CYGPATH_W) '$(srcdir)/src/chdir.c'; fi`
++
++src/chmod.o: src/chmod.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chmod.o -MD -MP -MF "src/$(DEPDIR)/chmod.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/chmod.o `test -f 'src/chmod.c' || echo '$(srcdir)/'`src/chmod.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chmod.Tpo" "src/$(DEPDIR)/chmod.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chmod.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chmod.c' object='src/chmod.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chmod.Po' tmpdepfile='src/$(DEPDIR)/chmod.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chmod.o `test -f 'src/chmod.c' || echo '$(srcdir)/'`src/chmod.c
++
++src/chmod.obj: src/chmod.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chmod.obj -MD -MP -MF "src/$(DEPDIR)/chmod.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/chmod.obj `if test -f 'src/chmod.c'; then $(CYGPATH_W) 'src/chmod.c'; else $(CYGPATH_W) '$(srcdir)/src/chmod.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chmod.Tpo" "src/$(DEPDIR)/chmod.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chmod.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chmod.c' object='src/chmod.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chmod.Po' tmpdepfile='src/$(DEPDIR)/chmod.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chmod.obj `if test -f 'src/chmod.c'; then $(CYGPATH_W) 'src/chmod.c'; else $(CYGPATH_W) '$(srcdir)/src/chmod.c'; fi`
++
++src/chown.o: src/chown.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chown.o -MD -MP -MF "src/$(DEPDIR)/chown.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/chown.o `test -f 'src/chown.c' || echo '$(srcdir)/'`src/chown.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chown.Tpo" "src/$(DEPDIR)/chown.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chown.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chown.c' object='src/chown.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chown.Po' tmpdepfile='src/$(DEPDIR)/chown.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chown.o `test -f 'src/chown.c' || echo '$(srcdir)/'`src/chown.c
++
++src/chown.obj: src/chown.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chown.obj -MD -MP -MF "src/$(DEPDIR)/chown.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/chown.obj `if test -f 'src/chown.c'; then $(CYGPATH_W) 'src/chown.c'; else $(CYGPATH_W) '$(srcdir)/src/chown.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chown.Tpo" "src/$(DEPDIR)/chown.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chown.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chown.c' object='src/chown.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chown.Po' tmpdepfile='src/$(DEPDIR)/chown.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chown.obj `if test -f 'src/chown.c'; then $(CYGPATH_W) 'src/chown.c'; else $(CYGPATH_W) '$(srcdir)/src/chown.c'; fi`
++
++src/dev.o: src/dev.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dev.o -MD -MP -MF "src/$(DEPDIR)/dev.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/dev.o `test -f 'src/dev.c' || echo '$(srcdir)/'`src/dev.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/dev.Tpo" "src/$(DEPDIR)/dev.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/dev.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/dev.c' object='src/dev.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/dev.Po' tmpdepfile='src/$(DEPDIR)/dev.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dev.o `test -f 'src/dev.c' || echo '$(srcdir)/'`src/dev.c
++
++src/dev.obj: src/dev.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dev.obj -MD -MP -MF "src/$(DEPDIR)/dev.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/dev.obj `if test -f 'src/dev.c'; then $(CYGPATH_W) 'src/dev.c'; else $(CYGPATH_W) '$(srcdir)/src/dev.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/dev.Tpo" "src/$(DEPDIR)/dev.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/dev.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/dev.c' object='src/dev.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/dev.Po' tmpdepfile='src/$(DEPDIR)/dev.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dev.obj `if test -f 'src/dev.c'; then $(CYGPATH_W) 'src/dev.c'; else $(CYGPATH_W) '$(srcdir)/src/dev.c'; fi`
++
++src/dup.o: src/dup.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dup.o -MD -MP -MF "src/$(DEPDIR)/dup.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/dup.o `test -f 'src/dup.c' || echo '$(srcdir)/'`src/dup.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/dup.Tpo" "src/$(DEPDIR)/dup.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/dup.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/dup.c' object='src/dup.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/dup.Po' tmpdepfile='src/$(DEPDIR)/dup.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dup.o `test -f 'src/dup.c' || echo '$(srcdir)/'`src/dup.c
++
++src/dup.obj: src/dup.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dup.obj -MD -MP -MF "src/$(DEPDIR)/dup.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/dup.obj `if test -f 'src/dup.c'; then $(CYGPATH_W) 'src/dup.c'; else $(CYGPATH_W) '$(srcdir)/src/dup.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/dup.Tpo" "src/$(DEPDIR)/dup.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/dup.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/dup.c' object='src/dup.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/dup.Po' tmpdepfile='src/$(DEPDIR)/dup.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dup.obj `if test -f 'src/dup.c'; then $(CYGPATH_W) 'src/dup.c'; else $(CYGPATH_W) '$(srcdir)/src/dup.c'; fi`
++
++src/fcntl.o: src/fcntl.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fcntl.o -MD -MP -MF "src/$(DEPDIR)/fcntl.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/fcntl.o `test -f 'src/fcntl.c' || echo '$(srcdir)/'`src/fcntl.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fcntl.Tpo" "src/$(DEPDIR)/fcntl.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fcntl.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fcntl.c' object='src/fcntl.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fcntl.Po' tmpdepfile='src/$(DEPDIR)/fcntl.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fcntl.o `test -f 'src/fcntl.c' || echo '$(srcdir)/'`src/fcntl.c
++
++src/fcntl.obj: src/fcntl.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fcntl.obj -MD -MP -MF "src/$(DEPDIR)/fcntl.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/fcntl.obj `if test -f 'src/fcntl.c'; then $(CYGPATH_W) 'src/fcntl.c'; else $(CYGPATH_W) '$(srcdir)/src/fcntl.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fcntl.Tpo" "src/$(DEPDIR)/fcntl.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fcntl.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fcntl.c' object='src/fcntl.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fcntl.Po' tmpdepfile='src/$(DEPDIR)/fcntl.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fcntl.obj `if test -f 'src/fcntl.c'; then $(CYGPATH_W) 'src/fcntl.c'; else $(CYGPATH_W) '$(srcdir)/src/fcntl.c'; fi`
++
++src/fs.o: src/fs.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fs.o -MD -MP -MF "src/$(DEPDIR)/fs.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/fs.o `test -f 'src/fs.c' || echo '$(srcdir)/'`src/fs.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fs.Tpo" "src/$(DEPDIR)/fs.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fs.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fs.c' object='src/fs.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fs.Po' tmpdepfile='src/$(DEPDIR)/fs.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fs.o `test -f 'src/fs.c' || echo '$(srcdir)/'`src/fs.c
++
++src/fs.obj: src/fs.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fs.obj -MD -MP -MF "src/$(DEPDIR)/fs.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/fs.obj `if test -f 'src/fs.c'; then $(CYGPATH_W) 'src/fs.c'; else $(CYGPATH_W) '$(srcdir)/src/fs.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fs.Tpo" "src/$(DEPDIR)/fs.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fs.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fs.c' object='src/fs.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fs.Po' tmpdepfile='src/$(DEPDIR)/fs.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fs.obj `if test -f 'src/fs.c'; then $(CYGPATH_W) 'src/fs.c'; else $(CYGPATH_W) '$(srcdir)/src/fs.c'; fi`
++
++src/fsync.o: src/fsync.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fsync.o -MD -MP -MF "src/$(DEPDIR)/fsync.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/fsync.o `test -f 'src/fsync.c' || echo '$(srcdir)/'`src/fsync.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fsync.Tpo" "src/$(DEPDIR)/fsync.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fsync.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fsync.c' object='src/fsync.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fsync.Po' tmpdepfile='src/$(DEPDIR)/fsync.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fsync.o `test -f 'src/fsync.c' || echo '$(srcdir)/'`src/fsync.c
++
++src/fsync.obj: src/fsync.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fsync.obj -MD -MP -MF "src/$(DEPDIR)/fsync.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/fsync.obj `if test -f 'src/fsync.c'; then $(CYGPATH_W) 'src/fsync.c'; else $(CYGPATH_W) '$(srcdir)/src/fsync.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fsync.Tpo" "src/$(DEPDIR)/fsync.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fsync.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fsync.c' object='src/fsync.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fsync.Po' tmpdepfile='src/$(DEPDIR)/fsync.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fsync.obj `if test -f 'src/fsync.c'; then $(CYGPATH_W) 'src/fsync.c'; else $(CYGPATH_W) '$(srcdir)/src/fsync.c'; fi`
++
++src/getdirentries.o: src/getdirentries.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/getdirentries.o -MD -MP -MF "src/$(DEPDIR)/getdirentries.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/getdirentries.o `test -f 'src/getdirentries.c' || echo '$(srcdir)/'`src/getdirentries.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/getdirentries.Tpo" "src/$(DEPDIR)/getdirentries.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/getdirentries.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/getdirentries.c' object='src/getdirentries.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/getdirentries.Po' tmpdepfile='src/$(DEPDIR)/getdirentries.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/getdirentries.o `test -f 'src/getdirentries.c' || echo '$(srcdir)/'`src/getdirentries.c
++
++src/getdirentries.obj: src/getdirentries.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/getdirentries.obj -MD -MP -MF "src/$(DEPDIR)/getdirentries.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/getdirentries.obj `if test -f 'src/getdirentries.c'; then $(CYGPATH_W) 'src/getdirentries.c'; else $(CYGPATH_W) '$(srcdir)/src/getdirentries.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/getdirentries.Tpo" "src/$(DEPDIR)/getdirentries.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/getdirentries.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/getdirentries.c' object='src/getdirentries.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/getdirentries.Po' tmpdepfile='src/$(DEPDIR)/getdirentries.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/getdirentries.obj `if test -f 'src/getdirentries.c'; then $(CYGPATH_W) 'src/getdirentries.c'; else $(CYGPATH_W) '$(srcdir)/src/getdirentries.c'; fi`
++
++src/init.o: src/init.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/init.o -MD -MP -MF "src/$(DEPDIR)/init.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/init.o `test -f 'src/init.c' || echo '$(srcdir)/'`src/init.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/init.Tpo" "src/$(DEPDIR)/init.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/init.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/init.c' object='src/init.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/init.Po' tmpdepfile='src/$(DEPDIR)/init.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/init.o `test -f 'src/init.c' || echo '$(srcdir)/'`src/init.c
++
++src/init.obj: src/init.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/init.obj -MD -MP -MF "src/$(DEPDIR)/init.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/init.obj `if test -f 'src/init.c'; then $(CYGPATH_W) 'src/init.c'; else $(CYGPATH_W) '$(srcdir)/src/init.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/init.Tpo" "src/$(DEPDIR)/init.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/init.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/init.c' object='src/init.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/init.Po' tmpdepfile='src/$(DEPDIR)/init.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/init.obj `if test -f 'src/init.c'; then $(CYGPATH_W) 'src/init.c'; else $(CYGPATH_W) '$(srcdir)/src/init.c'; fi`
++
++src/inode.o: src/inode.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/inode.o -MD -MP -MF "src/$(DEPDIR)/inode.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/inode.o `test -f 'src/inode.c' || echo '$(srcdir)/'`src/inode.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/inode.Tpo" "src/$(DEPDIR)/inode.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/inode.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/inode.c' object='src/inode.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/inode.Po' tmpdepfile='src/$(DEPDIR)/inode.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/inode.o `test -f 'src/inode.c' || echo '$(srcdir)/'`src/inode.c
++
++src/inode.obj: src/inode.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/inode.obj -MD -MP -MF "src/$(DEPDIR)/inode.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/inode.obj `if test -f 'src/inode.c'; then $(CYGPATH_W) 'src/inode.c'; else $(CYGPATH_W) '$(srcdir)/src/inode.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/inode.Tpo" "src/$(DEPDIR)/inode.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/inode.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/inode.c' object='src/inode.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/inode.Po' tmpdepfile='src/$(DEPDIR)/inode.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/inode.obj `if test -f 'src/inode.c'; then $(CYGPATH_W) 'src/inode.c'; else $(CYGPATH_W) '$(srcdir)/src/inode.c'; fi`
++
++src/ioctl.o: src/ioctl.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ioctl.o -MD -MP -MF "src/$(DEPDIR)/ioctl.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/ioctl.o `test -f 'src/ioctl.c' || echo '$(srcdir)/'`src/ioctl.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/ioctl.Tpo" "src/$(DEPDIR)/ioctl.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/ioctl.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ioctl.c' object='src/ioctl.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/ioctl.Po' tmpdepfile='src/$(DEPDIR)/ioctl.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ioctl.o `test -f 'src/ioctl.c' || echo '$(srcdir)/'`src/ioctl.c
++
++src/ioctl.obj: src/ioctl.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ioctl.obj -MD -MP -MF "src/$(DEPDIR)/ioctl.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/ioctl.obj `if test -f 'src/ioctl.c'; then $(CYGPATH_W) 'src/ioctl.c'; else $(CYGPATH_W) '$(srcdir)/src/ioctl.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/ioctl.Tpo" "src/$(DEPDIR)/ioctl.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/ioctl.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ioctl.c' object='src/ioctl.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/ioctl.Po' tmpdepfile='src/$(DEPDIR)/ioctl.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ioctl.obj `if test -f 'src/ioctl.c'; then $(CYGPATH_W) 'src/ioctl.c'; else $(CYGPATH_W) '$(srcdir)/src/ioctl.c'; fi`
++
++src/ioctx.o: src/ioctx.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ioctx.o -MD -MP -MF "src/$(DEPDIR)/ioctx.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/ioctx.o `test -f 'src/ioctx.c' || echo '$(srcdir)/'`src/ioctx.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/ioctx.Tpo" "src/$(DEPDIR)/ioctx.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/ioctx.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ioctx.c' object='src/ioctx.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/ioctx.Po' tmpdepfile='src/$(DEPDIR)/ioctx.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ioctx.o `test -f 'src/ioctx.c' || echo '$(srcdir)/'`src/ioctx.c
++
++src/ioctx.obj: src/ioctx.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ioctx.obj -MD -MP -MF "src/$(DEPDIR)/ioctx.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/ioctx.obj `if test -f 'src/ioctx.c'; then $(CYGPATH_W) 'src/ioctx.c'; else $(CYGPATH_W) '$(srcdir)/src/ioctx.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/ioctx.Tpo" "src/$(DEPDIR)/ioctx.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/ioctx.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ioctx.c' object='src/ioctx.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/ioctx.Po' tmpdepfile='src/$(DEPDIR)/ioctx.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ioctx.obj `if test -f 'src/ioctx.c'; then $(CYGPATH_W) 'src/ioctx.c'; else $(CYGPATH_W) '$(srcdir)/src/ioctx.c'; fi`
++
++src/iowait.o: src/iowait.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/iowait.o -MD -MP -MF "src/$(DEPDIR)/iowait.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/iowait.o `test -f 'src/iowait.c' || echo '$(srcdir)/'`src/iowait.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/iowait.Tpo" "src/$(DEPDIR)/iowait.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/iowait.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/iowait.c' object='src/iowait.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/iowait.Po' tmpdepfile='src/$(DEPDIR)/iowait.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/iowait.o `test -f 'src/iowait.c' || echo '$(srcdir)/'`src/iowait.c
++
++src/iowait.obj: src/iowait.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/iowait.obj -MD -MP -MF "src/$(DEPDIR)/iowait.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/iowait.obj `if test -f 'src/iowait.c'; then $(CYGPATH_W) 'src/iowait.c'; else $(CYGPATH_W) '$(srcdir)/src/iowait.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/iowait.Tpo" "src/$(DEPDIR)/iowait.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/iowait.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/iowait.c' object='src/iowait.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/iowait.Po' tmpdepfile='src/$(DEPDIR)/iowait.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/iowait.obj `if test -f 'src/iowait.c'; then $(CYGPATH_W) 'src/iowait.c'; else $(CYGPATH_W) '$(srcdir)/src/iowait.c'; fi`
++
++src/link.o: src/link.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/link.o -MD -MP -MF "src/$(DEPDIR)/link.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/link.o `test -f 'src/link.c' || echo '$(srcdir)/'`src/link.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/link.Tpo" "src/$(DEPDIR)/link.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/link.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/link.c' object='src/link.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/link.Po' tmpdepfile='src/$(DEPDIR)/link.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/link.o `test -f 'src/link.c' || echo '$(srcdir)/'`src/link.c
++
++src/link.obj: src/link.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/link.obj -MD -MP -MF "src/$(DEPDIR)/link.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/link.obj `if test -f 'src/link.c'; then $(CYGPATH_W) 'src/link.c'; else $(CYGPATH_W) '$(srcdir)/src/link.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/link.Tpo" "src/$(DEPDIR)/link.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/link.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/link.c' object='src/link.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/link.Po' tmpdepfile='src/$(DEPDIR)/link.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/link.obj `if test -f 'src/link.c'; then $(CYGPATH_W) 'src/link.c'; else $(CYGPATH_W) '$(srcdir)/src/link.c'; fi`
++
++src/lseek.o: src/lseek.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/lseek.o -MD -MP -MF "src/$(DEPDIR)/lseek.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/lseek.o `test -f 'src/lseek.c' || echo '$(srcdir)/'`src/lseek.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/lseek.Tpo" "src/$(DEPDIR)/lseek.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/lseek.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/lseek.c' object='src/lseek.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/lseek.Po' tmpdepfile='src/$(DEPDIR)/lseek.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/lseek.o `test -f 'src/lseek.c' || echo '$(srcdir)/'`src/lseek.c
++
++src/lseek.obj: src/lseek.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/lseek.obj -MD -MP -MF "src/$(DEPDIR)/lseek.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/lseek.obj `if test -f 'src/lseek.c'; then $(CYGPATH_W) 'src/lseek.c'; else $(CYGPATH_W) '$(srcdir)/src/lseek.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/lseek.Tpo" "src/$(DEPDIR)/lseek.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/lseek.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/lseek.c' object='src/lseek.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/lseek.Po' tmpdepfile='src/$(DEPDIR)/lseek.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/lseek.obj `if test -f 'src/lseek.c'; then $(CYGPATH_W) 'src/lseek.c'; else $(CYGPATH_W) '$(srcdir)/src/lseek.c'; fi`
++
++src/mkdir.o: src/mkdir.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mkdir.o -MD -MP -MF "src/$(DEPDIR)/mkdir.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/mkdir.o `test -f 'src/mkdir.c' || echo '$(srcdir)/'`src/mkdir.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mkdir.Tpo" "src/$(DEPDIR)/mkdir.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mkdir.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mkdir.c' object='src/mkdir.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mkdir.Po' tmpdepfile='src/$(DEPDIR)/mkdir.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mkdir.o `test -f 'src/mkdir.c' || echo '$(srcdir)/'`src/mkdir.c
++
++src/mkdir.obj: src/mkdir.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mkdir.obj -MD -MP -MF "src/$(DEPDIR)/mkdir.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/mkdir.obj `if test -f 'src/mkdir.c'; then $(CYGPATH_W) 'src/mkdir.c'; else $(CYGPATH_W) '$(srcdir)/src/mkdir.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mkdir.Tpo" "src/$(DEPDIR)/mkdir.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mkdir.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mkdir.c' object='src/mkdir.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mkdir.Po' tmpdepfile='src/$(DEPDIR)/mkdir.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mkdir.obj `if test -f 'src/mkdir.c'; then $(CYGPATH_W) 'src/mkdir.c'; else $(CYGPATH_W) '$(srcdir)/src/mkdir.c'; fi`
++
++src/mknod.o: src/mknod.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mknod.o -MD -MP -MF "src/$(DEPDIR)/mknod.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/mknod.o `test -f 'src/mknod.c' || echo '$(srcdir)/'`src/mknod.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mknod.Tpo" "src/$(DEPDIR)/mknod.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mknod.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mknod.c' object='src/mknod.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mknod.Po' tmpdepfile='src/$(DEPDIR)/mknod.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mknod.o `test -f 'src/mknod.c' || echo '$(srcdir)/'`src/mknod.c
++
++src/mknod.obj: src/mknod.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mknod.obj -MD -MP -MF "src/$(DEPDIR)/mknod.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/mknod.obj `if test -f 'src/mknod.c'; then $(CYGPATH_W) 'src/mknod.c'; else $(CYGPATH_W) '$(srcdir)/src/mknod.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mknod.Tpo" "src/$(DEPDIR)/mknod.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mknod.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mknod.c' object='src/mknod.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mknod.Po' tmpdepfile='src/$(DEPDIR)/mknod.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mknod.obj `if test -f 'src/mknod.c'; then $(CYGPATH_W) 'src/mknod.c'; else $(CYGPATH_W) '$(srcdir)/src/mknod.c'; fi`
++
++src/mount.o: src/mount.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mount.o -MD -MP -MF "src/$(DEPDIR)/mount.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/mount.o `test -f 'src/mount.c' || echo '$(srcdir)/'`src/mount.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mount.Tpo" "src/$(DEPDIR)/mount.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mount.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mount.c' object='src/mount.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mount.Po' tmpdepfile='src/$(DEPDIR)/mount.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mount.o `test -f 'src/mount.c' || echo '$(srcdir)/'`src/mount.c
++
++src/mount.obj: src/mount.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mount.obj -MD -MP -MF "src/$(DEPDIR)/mount.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/mount.obj `if test -f 'src/mount.c'; then $(CYGPATH_W) 'src/mount.c'; else $(CYGPATH_W) '$(srcdir)/src/mount.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mount.Tpo" "src/$(DEPDIR)/mount.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mount.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mount.c' object='src/mount.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mount.Po' tmpdepfile='src/$(DEPDIR)/mount.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mount.obj `if test -f 'src/mount.c'; then $(CYGPATH_W) 'src/mount.c'; else $(CYGPATH_W) '$(srcdir)/src/mount.c'; fi`
++
++src/namei.o: src/namei.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/namei.o -MD -MP -MF "src/$(DEPDIR)/namei.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/namei.o `test -f 'src/namei.c' || echo '$(srcdir)/'`src/namei.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/namei.Tpo" "src/$(DEPDIR)/namei.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/namei.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/namei.c' object='src/namei.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/namei.Po' tmpdepfile='src/$(DEPDIR)/namei.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/namei.o `test -f 'src/namei.c' || echo '$(srcdir)/'`src/namei.c
++
++src/namei.obj: src/namei.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/namei.obj -MD -MP -MF "src/$(DEPDIR)/namei.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/namei.obj `if test -f 'src/namei.c'; then $(CYGPATH_W) 'src/namei.c'; else $(CYGPATH_W) '$(srcdir)/src/namei.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/namei.Tpo" "src/$(DEPDIR)/namei.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/namei.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/namei.c' object='src/namei.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/namei.Po' tmpdepfile='src/$(DEPDIR)/namei.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/namei.obj `if test -f 'src/namei.c'; then $(CYGPATH_W) 'src/namei.c'; else $(CYGPATH_W) '$(srcdir)/src/namei.c'; fi`
++
++src/open.o: src/open.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/open.o -MD -MP -MF "src/$(DEPDIR)/open.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/open.o `test -f 'src/open.c' || echo '$(srcdir)/'`src/open.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/open.Tpo" "src/$(DEPDIR)/open.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/open.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/open.c' object='src/open.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/open.Po' tmpdepfile='src/$(DEPDIR)/open.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/open.o `test -f 'src/open.c' || echo '$(srcdir)/'`src/open.c
++
++src/open.obj: src/open.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/open.obj -MD -MP -MF "src/$(DEPDIR)/open.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/open.obj `if test -f 'src/open.c'; then $(CYGPATH_W) 'src/open.c'; else $(CYGPATH_W) '$(srcdir)/src/open.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/open.Tpo" "src/$(DEPDIR)/open.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/open.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/open.c' object='src/open.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/open.Po' tmpdepfile='src/$(DEPDIR)/open.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/open.obj `if test -f 'src/open.c'; then $(CYGPATH_W) 'src/open.c'; else $(CYGPATH_W) '$(srcdir)/src/open.c'; fi`
++
++src/rw.o: src/rw.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rw.o -MD -MP -MF "src/$(DEPDIR)/rw.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/rw.o `test -f 'src/rw.c' || echo '$(srcdir)/'`src/rw.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rw.Tpo" "src/$(DEPDIR)/rw.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rw.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rw.c' object='src/rw.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rw.Po' tmpdepfile='src/$(DEPDIR)/rw.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rw.o `test -f 'src/rw.c' || echo '$(srcdir)/'`src/rw.c
++
++src/rw.obj: src/rw.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rw.obj -MD -MP -MF "src/$(DEPDIR)/rw.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/rw.obj `if test -f 'src/rw.c'; then $(CYGPATH_W) 'src/rw.c'; else $(CYGPATH_W) '$(srcdir)/src/rw.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rw.Tpo" "src/$(DEPDIR)/rw.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rw.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rw.c' object='src/rw.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rw.Po' tmpdepfile='src/$(DEPDIR)/rw.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rw.obj `if test -f 'src/rw.c'; then $(CYGPATH_W) 'src/rw.c'; else $(CYGPATH_W) '$(srcdir)/src/rw.c'; fi`
++
++src/reconcile.o: src/reconcile.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/reconcile.o -MD -MP -MF "src/$(DEPDIR)/reconcile.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/reconcile.o `test -f 'src/reconcile.c' || echo '$(srcdir)/'`src/reconcile.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/reconcile.Tpo" "src/$(DEPDIR)/reconcile.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/reconcile.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/reconcile.c' object='src/reconcile.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/reconcile.Po' tmpdepfile='src/$(DEPDIR)/reconcile.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/reconcile.o `test -f 'src/reconcile.c' || echo '$(srcdir)/'`src/reconcile.c
++
++src/reconcile.obj: src/reconcile.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/reconcile.obj -MD -MP -MF "src/$(DEPDIR)/reconcile.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/reconcile.obj `if test -f 'src/reconcile.c'; then $(CYGPATH_W) 'src/reconcile.c'; else $(CYGPATH_W) '$(srcdir)/src/reconcile.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/reconcile.Tpo" "src/$(DEPDIR)/reconcile.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/reconcile.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/reconcile.c' object='src/reconcile.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/reconcile.Po' tmpdepfile='src/$(DEPDIR)/reconcile.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/reconcile.obj `if test -f 'src/reconcile.c'; then $(CYGPATH_W) 'src/reconcile.c'; else $(CYGPATH_W) '$(srcdir)/src/reconcile.c'; fi`
++
++src/rename.o: src/rename.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rename.o -MD -MP -MF "src/$(DEPDIR)/rename.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/rename.o `test -f 'src/rename.c' || echo '$(srcdir)/'`src/rename.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rename.Tpo" "src/$(DEPDIR)/rename.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rename.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rename.c' object='src/rename.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rename.Po' tmpdepfile='src/$(DEPDIR)/rename.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rename.o `test -f 'src/rename.c' || echo '$(srcdir)/'`src/rename.c
++
++src/rename.obj: src/rename.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rename.obj -MD -MP -MF "src/$(DEPDIR)/rename.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/rename.obj `if test -f 'src/rename.c'; then $(CYGPATH_W) 'src/rename.c'; else $(CYGPATH_W) '$(srcdir)/src/rename.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rename.Tpo" "src/$(DEPDIR)/rename.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rename.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rename.c' object='src/rename.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rename.Po' tmpdepfile='src/$(DEPDIR)/rename.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rename.obj `if test -f 'src/rename.c'; then $(CYGPATH_W) 'src/rename.c'; else $(CYGPATH_W) '$(srcdir)/src/rename.c'; fi`
++
++src/rmdir.o: src/rmdir.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rmdir.o -MD -MP -MF "src/$(DEPDIR)/rmdir.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/rmdir.o `test -f 'src/rmdir.c' || echo '$(srcdir)/'`src/rmdir.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rmdir.Tpo" "src/$(DEPDIR)/rmdir.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rmdir.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rmdir.c' object='src/rmdir.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rmdir.Po' tmpdepfile='src/$(DEPDIR)/rmdir.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rmdir.o `test -f 'src/rmdir.c' || echo '$(srcdir)/'`src/rmdir.c
++
++src/rmdir.obj: src/rmdir.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rmdir.obj -MD -MP -MF "src/$(DEPDIR)/rmdir.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/rmdir.obj `if test -f 'src/rmdir.c'; then $(CYGPATH_W) 'src/rmdir.c'; else $(CYGPATH_W) '$(srcdir)/src/rmdir.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rmdir.Tpo" "src/$(DEPDIR)/rmdir.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rmdir.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rmdir.c' object='src/rmdir.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rmdir.Po' tmpdepfile='src/$(DEPDIR)/rmdir.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rmdir.obj `if test -f 'src/rmdir.c'; then $(CYGPATH_W) 'src/rmdir.c'; else $(CYGPATH_W) '$(srcdir)/src/rmdir.c'; fi`
++
++src/stat64.o: src/stat64.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stat64.o -MD -MP -MF "src/$(DEPDIR)/stat64.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/stat64.o `test -f 'src/stat64.c' || echo '$(srcdir)/'`src/stat64.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stat64.Tpo" "src/$(DEPDIR)/stat64.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stat64.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stat64.c' object='src/stat64.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stat64.Po' tmpdepfile='src/$(DEPDIR)/stat64.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stat64.o `test -f 'src/stat64.c' || echo '$(srcdir)/'`src/stat64.c
++
++src/stat64.obj: src/stat64.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stat64.obj -MD -MP -MF "src/$(DEPDIR)/stat64.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/stat64.obj `if test -f 'src/stat64.c'; then $(CYGPATH_W) 'src/stat64.c'; else $(CYGPATH_W) '$(srcdir)/src/stat64.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stat64.Tpo" "src/$(DEPDIR)/stat64.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stat64.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stat64.c' object='src/stat64.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stat64.Po' tmpdepfile='src/$(DEPDIR)/stat64.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stat64.obj `if test -f 'src/stat64.c'; then $(CYGPATH_W) 'src/stat64.c'; else $(CYGPATH_W) '$(srcdir)/src/stat64.c'; fi`
++
++src/stat.o: src/stat.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stat.o -MD -MP -MF "src/$(DEPDIR)/stat.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/stat.o `test -f 'src/stat.c' || echo '$(srcdir)/'`src/stat.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stat.Tpo" "src/$(DEPDIR)/stat.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stat.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stat.c' object='src/stat.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stat.Po' tmpdepfile='src/$(DEPDIR)/stat.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stat.o `test -f 'src/stat.c' || echo '$(srcdir)/'`src/stat.c
++
++src/stat.obj: src/stat.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stat.obj -MD -MP -MF "src/$(DEPDIR)/stat.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/stat.obj `if test -f 'src/stat.c'; then $(CYGPATH_W) 'src/stat.c'; else $(CYGPATH_W) '$(srcdir)/src/stat.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stat.Tpo" "src/$(DEPDIR)/stat.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stat.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stat.c' object='src/stat.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stat.Po' tmpdepfile='src/$(DEPDIR)/stat.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stat.obj `if test -f 'src/stat.c'; then $(CYGPATH_W) 'src/stat.c'; else $(CYGPATH_W) '$(srcdir)/src/stat.c'; fi`
++
++src/stddir.o: src/stddir.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stddir.o -MD -MP -MF "src/$(DEPDIR)/stddir.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/stddir.o `test -f 'src/stddir.c' || echo '$(srcdir)/'`src/stddir.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stddir.Tpo" "src/$(DEPDIR)/stddir.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stddir.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stddir.c' object='src/stddir.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stddir.Po' tmpdepfile='src/$(DEPDIR)/stddir.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stddir.o `test -f 'src/stddir.c' || echo '$(srcdir)/'`src/stddir.c
++
++src/stddir.obj: src/stddir.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stddir.obj -MD -MP -MF "src/$(DEPDIR)/stddir.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/stddir.obj `if test -f 'src/stddir.c'; then $(CYGPATH_W) 'src/stddir.c'; else $(CYGPATH_W) '$(srcdir)/src/stddir.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stddir.Tpo" "src/$(DEPDIR)/stddir.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stddir.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stddir.c' object='src/stddir.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stddir.Po' tmpdepfile='src/$(DEPDIR)/stddir.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stddir.obj `if test -f 'src/stddir.c'; then $(CYGPATH_W) 'src/stddir.c'; else $(CYGPATH_W) '$(srcdir)/src/stddir.c'; fi`
++
++src/readdir.o: src/readdir.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readdir.o -MD -MP -MF "src/$(DEPDIR)/readdir.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/readdir.o `test -f 'src/readdir.c' || echo '$(srcdir)/'`src/readdir.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readdir.Tpo" "src/$(DEPDIR)/readdir.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readdir.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readdir.c' object='src/readdir.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readdir.Po' tmpdepfile='src/$(DEPDIR)/readdir.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readdir.o `test -f 'src/readdir.c' || echo '$(srcdir)/'`src/readdir.c
++
++src/readdir.obj: src/readdir.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readdir.obj -MD -MP -MF "src/$(DEPDIR)/readdir.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/readdir.obj `if test -f 'src/readdir.c'; then $(CYGPATH_W) 'src/readdir.c'; else $(CYGPATH_W) '$(srcdir)/src/readdir.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readdir.Tpo" "src/$(DEPDIR)/readdir.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readdir.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readdir.c' object='src/readdir.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readdir.Po' tmpdepfile='src/$(DEPDIR)/readdir.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readdir.obj `if test -f 'src/readdir.c'; then $(CYGPATH_W) 'src/readdir.c'; else $(CYGPATH_W) '$(srcdir)/src/readdir.c'; fi`
++
++src/readdir64.o: src/readdir64.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readdir64.o -MD -MP -MF "src/$(DEPDIR)/readdir64.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/readdir64.o `test -f 'src/readdir64.c' || echo '$(srcdir)/'`src/readdir64.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readdir64.Tpo" "src/$(DEPDIR)/readdir64.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readdir64.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readdir64.c' object='src/readdir64.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readdir64.Po' tmpdepfile='src/$(DEPDIR)/readdir64.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readdir64.o `test -f 'src/readdir64.c' || echo '$(srcdir)/'`src/readdir64.c
++
++src/readdir64.obj: src/readdir64.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readdir64.obj -MD -MP -MF "src/$(DEPDIR)/readdir64.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/readdir64.obj `if test -f 'src/readdir64.c'; then $(CYGPATH_W) 'src/readdir64.c'; else $(CYGPATH_W) '$(srcdir)/src/readdir64.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readdir64.Tpo" "src/$(DEPDIR)/readdir64.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readdir64.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readdir64.c' object='src/readdir64.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readdir64.Po' tmpdepfile='src/$(DEPDIR)/readdir64.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readdir64.obj `if test -f 'src/readdir64.c'; then $(CYGPATH_W) 'src/readdir64.c'; else $(CYGPATH_W) '$(srcdir)/src/readdir64.c'; fi`
++
++src/symlink.o: src/symlink.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/symlink.o -MD -MP -MF "src/$(DEPDIR)/symlink.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/symlink.o `test -f 'src/symlink.c' || echo '$(srcdir)/'`src/symlink.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/symlink.Tpo" "src/$(DEPDIR)/symlink.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/symlink.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/symlink.c' object='src/symlink.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/symlink.Po' tmpdepfile='src/$(DEPDIR)/symlink.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/symlink.o `test -f 'src/symlink.c' || echo '$(srcdir)/'`src/symlink.c
++
++src/symlink.obj: src/symlink.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/symlink.obj -MD -MP -MF "src/$(DEPDIR)/symlink.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/symlink.obj `if test -f 'src/symlink.c'; then $(CYGPATH_W) 'src/symlink.c'; else $(CYGPATH_W) '$(srcdir)/src/symlink.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/symlink.Tpo" "src/$(DEPDIR)/symlink.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/symlink.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/symlink.c' object='src/symlink.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/symlink.Po' tmpdepfile='src/$(DEPDIR)/symlink.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/symlink.obj `if test -f 'src/symlink.c'; then $(CYGPATH_W) 'src/symlink.c'; else $(CYGPATH_W) '$(srcdir)/src/symlink.c'; fi`
++
++src/readlink.o: src/readlink.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readlink.o -MD -MP -MF "src/$(DEPDIR)/readlink.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/readlink.o `test -f 'src/readlink.c' || echo '$(srcdir)/'`src/readlink.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readlink.Tpo" "src/$(DEPDIR)/readlink.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readlink.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readlink.c' object='src/readlink.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readlink.Po' tmpdepfile='src/$(DEPDIR)/readlink.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readlink.o `test -f 'src/readlink.c' || echo '$(srcdir)/'`src/readlink.c
++
++src/readlink.obj: src/readlink.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readlink.obj -MD -MP -MF "src/$(DEPDIR)/readlink.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/readlink.obj `if test -f 'src/readlink.c'; then $(CYGPATH_W) 'src/readlink.c'; else $(CYGPATH_W) '$(srcdir)/src/readlink.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readlink.Tpo" "src/$(DEPDIR)/readlink.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readlink.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readlink.c' object='src/readlink.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readlink.Po' tmpdepfile='src/$(DEPDIR)/readlink.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readlink.obj `if test -f 'src/readlink.c'; then $(CYGPATH_W) 'src/readlink.c'; else $(CYGPATH_W) '$(srcdir)/src/readlink.c'; fi`
++
++src/truncate.o: src/truncate.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/truncate.o -MD -MP -MF "src/$(DEPDIR)/truncate.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/truncate.o `test -f 'src/truncate.c' || echo '$(srcdir)/'`src/truncate.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/truncate.Tpo" "src/$(DEPDIR)/truncate.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/truncate.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/truncate.c' object='src/truncate.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/truncate.Po' tmpdepfile='src/$(DEPDIR)/truncate.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/truncate.o `test -f 'src/truncate.c' || echo '$(srcdir)/'`src/truncate.c
++
++src/truncate.obj: src/truncate.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/truncate.obj -MD -MP -MF "src/$(DEPDIR)/truncate.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/truncate.obj `if test -f 'src/truncate.c'; then $(CYGPATH_W) 'src/truncate.c'; else $(CYGPATH_W) '$(srcdir)/src/truncate.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/truncate.Tpo" "src/$(DEPDIR)/truncate.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/truncate.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/truncate.c' object='src/truncate.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/truncate.Po' tmpdepfile='src/$(DEPDIR)/truncate.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/truncate.obj `if test -f 'src/truncate.c'; then $(CYGPATH_W) 'src/truncate.c'; else $(CYGPATH_W) '$(srcdir)/src/truncate.c'; fi`
++
++src/unlink.o: src/unlink.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/unlink.o -MD -MP -MF "src/$(DEPDIR)/unlink.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/unlink.o `test -f 'src/unlink.c' || echo '$(srcdir)/'`src/unlink.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/unlink.Tpo" "src/$(DEPDIR)/unlink.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/unlink.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/unlink.c' object='src/unlink.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/unlink.Po' tmpdepfile='src/$(DEPDIR)/unlink.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/unlink.o `test -f 'src/unlink.c' || echo '$(srcdir)/'`src/unlink.c
++
++src/unlink.obj: src/unlink.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/unlink.obj -MD -MP -MF "src/$(DEPDIR)/unlink.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/unlink.obj `if test -f 'src/unlink.c'; then $(CYGPATH_W) 'src/unlink.c'; else $(CYGPATH_W) '$(srcdir)/src/unlink.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/unlink.Tpo" "src/$(DEPDIR)/unlink.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/unlink.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/unlink.c' object='src/unlink.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/unlink.Po' tmpdepfile='src/$(DEPDIR)/unlink.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/unlink.obj `if test -f 'src/unlink.c'; then $(CYGPATH_W) 'src/unlink.c'; else $(CYGPATH_W) '$(srcdir)/src/unlink.c'; fi`
++
++src/utime.o: src/utime.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/utime.o -MD -MP -MF "src/$(DEPDIR)/utime.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/utime.o `test -f 'src/utime.c' || echo '$(srcdir)/'`src/utime.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/utime.Tpo" "src/$(DEPDIR)/utime.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/utime.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utime.c' object='src/utime.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/utime.Po' tmpdepfile='src/$(DEPDIR)/utime.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/utime.o `test -f 'src/utime.c' || echo '$(srcdir)/'`src/utime.c
++
++src/utime.obj: src/utime.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/utime.obj -MD -MP -MF "src/$(DEPDIR)/utime.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/utime.obj `if test -f 'src/utime.c'; then $(CYGPATH_W) 'src/utime.c'; else $(CYGPATH_W) '$(srcdir)/src/utime.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/utime.Tpo" "src/$(DEPDIR)/utime.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/utime.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utime.c' object='src/utime.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/utime.Po' tmpdepfile='src/$(DEPDIR)/utime.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/utime.obj `if test -f 'src/utime.c'; then $(CYGPATH_W) 'src/utime.c'; else $(CYGPATH_W) '$(srcdir)/src/utime.c'; fi`
++
++src/file_hack.o: src/file_hack.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file_hack.o -MD -MP -MF "src/$(DEPDIR)/file_hack.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/file_hack.o `test -f 'src/file_hack.c' || echo '$(srcdir)/'`src/file_hack.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/file_hack.Tpo" "src/$(DEPDIR)/file_hack.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/file_hack.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/file_hack.c' object='src/file_hack.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/file_hack.Po' tmpdepfile='src/$(DEPDIR)/file_hack.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file_hack.o `test -f 'src/file_hack.c' || echo '$(srcdir)/'`src/file_hack.c
++
++src/file_hack.obj: src/file_hack.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file_hack.obj -MD -MP -MF "src/$(DEPDIR)/file_hack.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/file_hack.obj `if test -f 'src/file_hack.c'; then $(CYGPATH_W) 'src/file_hack.c'; else $(CYGPATH_W) '$(srcdir)/src/file_hack.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/file_hack.Tpo" "src/$(DEPDIR)/file_hack.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/file_hack.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/file_hack.c' object='src/file_hack.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/file_hack.Po' tmpdepfile='src/$(DEPDIR)/file_hack.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file_hack.obj `if test -f 'src/file_hack.c'; then $(CYGPATH_W) 'src/file_hack.c'; else $(CYGPATH_W) '$(srcdir)/src/file_hack.c'; fi`
++
++src/file.o: src/file.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file.o -MD -MP -MF "src/$(DEPDIR)/file.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/file.o `test -f 'src/file.c' || echo '$(srcdir)/'`src/file.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/file.Tpo" "src/$(DEPDIR)/file.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/file.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/file.c' object='src/file.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/file.Po' tmpdepfile='src/$(DEPDIR)/file.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file.o `test -f 'src/file.c' || echo '$(srcdir)/'`src/file.c
++
++src/file.obj: src/file.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file.obj -MD -MP -MF "src/$(DEPDIR)/file.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/file.obj `if test -f 'src/file.c'; then $(CYGPATH_W) 'src/file.c'; else $(CYGPATH_W) '$(srcdir)/src/file.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/file.Tpo" "src/$(DEPDIR)/file.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/file.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/file.c' object='src/file.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/file.Po' tmpdepfile='src/$(DEPDIR)/file.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file.obj `if test -f 'src/file.c'; then $(CYGPATH_W) 'src/file.c'; else $(CYGPATH_W) '$(srcdir)/src/file.c'; fi`
++
++src/stdlib.o: src/stdlib.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stdlib.o -MD -MP -MF "src/$(DEPDIR)/stdlib.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/stdlib.o `test -f 'src/stdlib.c' || echo '$(srcdir)/'`src/stdlib.c; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stdlib.Tpo" "src/$(DEPDIR)/stdlib.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stdlib.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stdlib.c' object='src/stdlib.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stdlib.Po' tmpdepfile='src/$(DEPDIR)/stdlib.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stdlib.o `test -f 'src/stdlib.c' || echo '$(srcdir)/'`src/stdlib.c
++
++src/stdlib.obj: src/stdlib.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stdlib.obj -MD -MP -MF "src/$(DEPDIR)/stdlib.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o src/stdlib.obj `if test -f 'src/stdlib.c'; then $(CYGPATH_W) 'src/stdlib.c'; else $(CYGPATH_W) '$(srcdir)/src/stdlib.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stdlib.Tpo" "src/$(DEPDIR)/stdlib.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stdlib.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stdlib.c' object='src/stdlib.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stdlib.Po' tmpdepfile='src/$(DEPDIR)/stdlib.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stdlib.obj `if test -f 'src/stdlib.c'; then $(CYGPATH_W) 'src/stdlib.c'; else $(CYGPATH_W) '$(srcdir)/src/stdlib.c'; fi`
++
++dev/stdfd/stdfd.o: dev/stdfd/stdfd.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dev/stdfd/stdfd.o -MD -MP -MF "dev/stdfd/$(DEPDIR)/stdfd.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o dev/stdfd/stdfd.o `test -f 'dev/stdfd/stdfd.c' || echo '$(srcdir)/'`dev/stdfd/stdfd.c; \
++ at am__fastdepCC_TRUE@	then mv -f "dev/stdfd/$(DEPDIR)/stdfd.Tpo" "dev/stdfd/$(DEPDIR)/stdfd.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "dev/stdfd/$(DEPDIR)/stdfd.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dev/stdfd/stdfd.c' object='dev/stdfd/stdfd.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='dev/stdfd/$(DEPDIR)/stdfd.Po' tmpdepfile='dev/stdfd/$(DEPDIR)/stdfd.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dev/stdfd/stdfd.o `test -f 'dev/stdfd/stdfd.c' || echo '$(srcdir)/'`dev/stdfd/stdfd.c
++
++dev/stdfd/stdfd.obj: dev/stdfd/stdfd.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dev/stdfd/stdfd.obj -MD -MP -MF "dev/stdfd/$(DEPDIR)/stdfd.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o dev/stdfd/stdfd.obj `if test -f 'dev/stdfd/stdfd.c'; then $(CYGPATH_W) 'dev/stdfd/stdfd.c'; else $(CYGPATH_W) '$(srcdir)/dev/stdfd/stdfd.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "dev/stdfd/$(DEPDIR)/stdfd.Tpo" "dev/stdfd/$(DEPDIR)/stdfd.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "dev/stdfd/$(DEPDIR)/stdfd.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dev/stdfd/stdfd.c' object='dev/stdfd/stdfd.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='dev/stdfd/$(DEPDIR)/stdfd.Po' tmpdepfile='dev/stdfd/$(DEPDIR)/stdfd.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dev/stdfd/stdfd.obj `if test -f 'dev/stdfd/stdfd.c'; then $(CYGPATH_W) 'dev/stdfd/stdfd.c'; else $(CYGPATH_W) '$(srcdir)/dev/stdfd/stdfd.c'; fi`
++
++drivers/incore/fs_incore.o: drivers/incore/fs_incore.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/incore/fs_incore.o -MD -MP -MF "drivers/incore/$(DEPDIR)/fs_incore.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o drivers/incore/fs_incore.o `test -f 'drivers/incore/fs_incore.c' || echo '$(srcdir)/'`drivers/incore/fs_incore.c; \
++ at am__fastdepCC_TRUE@	then mv -f "drivers/incore/$(DEPDIR)/fs_incore.Tpo" "drivers/incore/$(DEPDIR)/fs_incore.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "drivers/incore/$(DEPDIR)/fs_incore.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/incore/fs_incore.c' object='drivers/incore/fs_incore.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/incore/$(DEPDIR)/fs_incore.Po' tmpdepfile='drivers/incore/$(DEPDIR)/fs_incore.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/incore/fs_incore.o `test -f 'drivers/incore/fs_incore.c' || echo '$(srcdir)/'`drivers/incore/fs_incore.c
++
++drivers/incore/fs_incore.obj: drivers/incore/fs_incore.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/incore/fs_incore.obj -MD -MP -MF "drivers/incore/$(DEPDIR)/fs_incore.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o drivers/incore/fs_incore.obj `if test -f 'drivers/incore/fs_incore.c'; then $(CYGPATH_W) 'drivers/incore/fs_incore.c'; else $(CYGPATH_W) '$(srcdir)/drivers/incore/fs_incore.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "drivers/incore/$(DEPDIR)/fs_incore.Tpo" "drivers/incore/$(DEPDIR)/fs_incore.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "drivers/incore/$(DEPDIR)/fs_incore.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/incore/fs_incore.c' object='drivers/incore/fs_incore.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/incore/$(DEPDIR)/fs_incore.Po' tmpdepfile='drivers/incore/$(DEPDIR)/fs_incore.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/incore/fs_incore.obj `if test -f 'drivers/incore/fs_incore.c'; then $(CYGPATH_W) 'drivers/incore/fs_incore.c'; else $(CYGPATH_W) '$(srcdir)/drivers/incore/fs_incore.c'; fi`
++
++drivers/sockets/sockets.o: drivers/sockets/sockets.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/sockets/sockets.o -MD -MP -MF "drivers/sockets/$(DEPDIR)/sockets.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o drivers/sockets/sockets.o `test -f 'drivers/sockets/sockets.c' || echo '$(srcdir)/'`drivers/sockets/sockets.c; \
++ at am__fastdepCC_TRUE@	then mv -f "drivers/sockets/$(DEPDIR)/sockets.Tpo" "drivers/sockets/$(DEPDIR)/sockets.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "drivers/sockets/$(DEPDIR)/sockets.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/sockets/sockets.c' object='drivers/sockets/sockets.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/sockets/$(DEPDIR)/sockets.Po' tmpdepfile='drivers/sockets/$(DEPDIR)/sockets.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/sockets/sockets.o `test -f 'drivers/sockets/sockets.c' || echo '$(srcdir)/'`drivers/sockets/sockets.c
++
++drivers/sockets/sockets.obj: drivers/sockets/sockets.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/sockets/sockets.obj -MD -MP -MF "drivers/sockets/$(DEPDIR)/sockets.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o drivers/sockets/sockets.obj `if test -f 'drivers/sockets/sockets.c'; then $(CYGPATH_W) 'drivers/sockets/sockets.c'; else $(CYGPATH_W) '$(srcdir)/drivers/sockets/sockets.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "drivers/sockets/$(DEPDIR)/sockets.Tpo" "drivers/sockets/$(DEPDIR)/sockets.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "drivers/sockets/$(DEPDIR)/sockets.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/sockets/sockets.c' object='drivers/sockets/sockets.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/sockets/$(DEPDIR)/sockets.Po' tmpdepfile='drivers/sockets/$(DEPDIR)/sockets.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/sockets/sockets.obj `if test -f 'drivers/sockets/sockets.c'; then $(CYGPATH_W) 'drivers/sockets/sockets.c'; else $(CYGPATH_W) '$(srcdir)/drivers/sockets/sockets.c'; fi`
++
++drivers/native/fs_native.o: drivers/native/fs_native.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/native/fs_native.o -MD -MP -MF "drivers/native/$(DEPDIR)/fs_native.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o drivers/native/fs_native.o `test -f 'drivers/native/fs_native.c' || echo '$(srcdir)/'`drivers/native/fs_native.c; \
++ at am__fastdepCC_TRUE@	then mv -f "drivers/native/$(DEPDIR)/fs_native.Tpo" "drivers/native/$(DEPDIR)/fs_native.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "drivers/native/$(DEPDIR)/fs_native.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/native/fs_native.c' object='drivers/native/fs_native.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/native/$(DEPDIR)/fs_native.Po' tmpdepfile='drivers/native/$(DEPDIR)/fs_native.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/native/fs_native.o `test -f 'drivers/native/fs_native.c' || echo '$(srcdir)/'`drivers/native/fs_native.c
++
++drivers/native/fs_native.obj: drivers/native/fs_native.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/native/fs_native.obj -MD -MP -MF "drivers/native/$(DEPDIR)/fs_native.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o drivers/native/fs_native.obj `if test -f 'drivers/native/fs_native.c'; then $(CYGPATH_W) 'drivers/native/fs_native.c'; else $(CYGPATH_W) '$(srcdir)/drivers/native/fs_native.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "drivers/native/$(DEPDIR)/fs_native.Tpo" "drivers/native/$(DEPDIR)/fs_native.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "drivers/native/$(DEPDIR)/fs_native.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/native/fs_native.c' object='drivers/native/fs_native.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/native/$(DEPDIR)/fs_native.Po' tmpdepfile='drivers/native/$(DEPDIR)/fs_native.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/native/fs_native.obj `if test -f 'drivers/native/fs_native.c'; then $(CYGPATH_W) 'drivers/native/fs_native.c'; else $(CYGPATH_W) '$(srcdir)/drivers/native/fs_native.c'; fi`
++
++drivers/yod/fs_yod.o: drivers/yod/fs_yod.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/yod/fs_yod.o -MD -MP -MF "drivers/yod/$(DEPDIR)/fs_yod.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o drivers/yod/fs_yod.o `test -f 'drivers/yod/fs_yod.c' || echo '$(srcdir)/'`drivers/yod/fs_yod.c; \
++ at am__fastdepCC_TRUE@	then mv -f "drivers/yod/$(DEPDIR)/fs_yod.Tpo" "drivers/yod/$(DEPDIR)/fs_yod.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "drivers/yod/$(DEPDIR)/fs_yod.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/yod/fs_yod.c' object='drivers/yod/fs_yod.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/yod/$(DEPDIR)/fs_yod.Po' tmpdepfile='drivers/yod/$(DEPDIR)/fs_yod.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/yod/fs_yod.o `test -f 'drivers/yod/fs_yod.c' || echo '$(srcdir)/'`drivers/yod/fs_yod.c
++
++drivers/yod/fs_yod.obj: drivers/yod/fs_yod.c
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/yod/fs_yod.obj -MD -MP -MF "drivers/yod/$(DEPDIR)/fs_yod.Tpo" \
++ at am__fastdepCC_TRUE@	  -c -o drivers/yod/fs_yod.obj `if test -f 'drivers/yod/fs_yod.c'; then $(CYGPATH_W) 'drivers/yod/fs_yod.c'; else $(CYGPATH_W) '$(srcdir)/drivers/yod/fs_yod.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "drivers/yod/$(DEPDIR)/fs_yod.Tpo" "drivers/yod/$(DEPDIR)/fs_yod.Po"; \
++ at am__fastdepCC_TRUE@	else rm -f "drivers/yod/$(DEPDIR)/fs_yod.Tpo"; exit 1; \
++ at am__fastdepCC_TRUE@	fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/yod/fs_yod.c' object='drivers/yod/fs_yod.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/yod/$(DEPDIR)/fs_yod.Po' tmpdepfile='drivers/yod/$(DEPDIR)/fs_yod.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/yod/fs_yod.obj `if test -f 'drivers/yod/fs_yod.c'; then $(CYGPATH_W) 'drivers/yod/fs_yod.c'; else $(CYGPATH_W) '$(srcdir)/drivers/yod/fs_yod.c'; fi`
+ uninstall-info-am:
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -628,7 +1616,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -640,11 +1627,10 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+-	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
+-	fi
++	test -z "$(ETAGS_ARGS)$$tags$$unique" \
++	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -667,11 +1653,24 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = .
++distdir = $(PACKAGE)-$(VERSION)
++
++am__remove_distdir = \
++  { test ! -d $(distdir) \
++    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++         && rm -fr $(distdir); }; }
++
++GZIP_ENV = --best
++distuninstallcheck_listfiles = find . -type f -print
++distcleancheck_listfiles = find . -type f -print
+ 
+ distdir: $(DISTFILES)
+ 	$(am__remove_distdir)
+ 	mkdir $(distdir)
+-	$(mkdir_p) $(distdir)/dev/stdfd $(distdir)/drivers/incore $(distdir)/drivers/native $(distdir)/drivers/sockets $(distdir)/drivers/yod $(distdir)/include $(distdir)/misc $(distdir)/src $(distdir)/tests
++	$(mkinstalldirs) $(distdir)/./dev/stdfd $(distdir)/./drivers/incore $(distdir)/./drivers/native $(distdir)/./drivers/sockets $(distdir)/./drivers/yod $(distdir)/./include $(distdir)/./src $(distdir)/./tests $(distdir)/dev/stdfd $(distdir)/drivers/incore $(distdir)/drivers/native $(distdir)/drivers/sockets $(distdir)/drivers/yod $(distdir)/include $(distdir)/misc $(distdir)/src $(distdir)/tests
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -683,7 +1682,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -704,46 +1703,19 @@
+ 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ 	|| chmod -R a+r $(distdir)
+ dist-gzip: distdir
+-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+-	$(am__remove_distdir)
+-
+-dist-bzip2: distdir
+-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+-	$(am__remove_distdir)
+-
+-dist-tarZ: distdir
+-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+-	$(am__remove_distdir)
+-
+-dist-shar: distdir
+-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+-	$(am__remove_distdir)
+-
+-dist-zip: distdir
+-	-rm -f $(distdir).zip
+-	zip -rq $(distdir).zip $(distdir)
++	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ 	$(am__remove_distdir)
+ 
+ dist dist-all: distdir
+-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ 	$(am__remove_distdir)
+ 
+ # This target untars the dist file and tries a VPATH configuration.  Then
+ # it guarantees that the distribution is self-contained by making another
+ # tarfile.
+ distcheck: dist
+-	case '$(DIST_ARCHIVES)' in \
+-	*.tar.gz*) \
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+-	*.tar.bz2*) \
+-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+-	*.tar.Z*) \
+-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+-	*.shar.gz*) \
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+-	*.zip*) \
+-	  unzip $(distdir).zip ;;\
+-	esac
++	$(am__remove_distdir)
++	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ 	chmod -R a-w $(distdir); chmod a+w $(distdir)
+ 	mkdir $(distdir)/_build
+ 	mkdir $(distdir)/_inst
+@@ -763,20 +1735,19 @@
+ 	        distuninstallcheck \
+ 	  && chmod -R a-w "$$dc_install_base" \
+ 	  && ({ \
+-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
++	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+ 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ 	  && rm -rf "$$dc_destdir" \
+-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+-	  && rm -rf $(DIST_ARCHIVES) \
++	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
++	  && rm -f $(distdir).tar.gz \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ 	$(am__remove_distdir)
+-	@(echo "$(distdir) archives ready for distribution: "; \
+-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
++	@echo "$(distdir).tar.gz is ready for distribution" | \
++	  sed 'h;s/./=/g;p;x;p;x'
+ distuninstallcheck:
+ 	@cd $(distuninstallcheck_dir) \
+ 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+@@ -798,10 +1769,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LIBRARIES)
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -821,24 +1791,26 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+-	-rm -f ${LIBBUILD_DIR}/$(am__dirstamp)
+-	-rm -f dev/stdfd/$(DEPDIR)/$(am__dirstamp)
++	-rm -f $(CONFIG_CLEAN_FILES)
+ 	-rm -f dev/stdfd/$(am__dirstamp)
+-	-rm -f drivers/incore/$(DEPDIR)/$(am__dirstamp)
+-	-rm -f drivers/incore/$(am__dirstamp)
+ 	-rm -f drivers/native/$(DEPDIR)/$(am__dirstamp)
++	-rm -f drivers/yod/$(am__dirstamp)
++	-rm -f drivers/yod/$(DEPDIR)/$(am__dirstamp)
+ 	-rm -f drivers/native/$(am__dirstamp)
+-	-rm -f drivers/sockets/$(DEPDIR)/$(am__dirstamp)
++	-rm -f src/$(am__dirstamp)
++	-rm -f dev/stdfd/$(DEPDIR)/$(am__dirstamp)
++	-rm -f drivers/incore/$(am__dirstamp)
+ 	-rm -f drivers/sockets/$(am__dirstamp)
+-	-rm -f drivers/yod/$(DEPDIR)/$(am__dirstamp)
+-	-rm -f drivers/yod/$(am__dirstamp)
++	-rm -f drivers/sockets/$(DEPDIR)/$(am__dirstamp)
++	-rm -f drivers/incore/$(DEPDIR)/$(am__dirstamp)
++	-rm -f ${LIBBUILD_DIR}/$(am__dirstamp)
+ 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
+-	-rm -f src/$(am__dirstamp)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+ 	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
+ clean-am: clean-generic clean-libLIBRARIES mostlyclean-am
+ 
+ distclean: distclean-am
+@@ -852,8 +1824,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -889,15 +1859,14 @@
+ 
+ uninstall-am: uninstall-info-am uninstall-libLIBRARIES
+ 
+-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
+-	clean-generic clean-libLIBRARIES ctags dist dist-all \
+-	dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
++	clean-libLIBRARIES ctags dist dist-all dist-gzip distcheck \
+ 	distclean distclean-compile distclean-generic distclean-tags \
+-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-libLIBRARIES install-man install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
++	distcleancheck distdir distuninstallcheck dvi dvi-am info \
++	info-am install install-am install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-libLIBRARIES install-man install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ 	uninstall-am uninstall-info-am uninstall-libLIBRARIES
+diff -Nurwd orig/lustre-1.8.2/libsysio/aclocal.m4 lustre-1.8.2/libsysio/aclocal.m4
+--- orig/lustre-1.8.2/libsysio/aclocal.m4	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/libsysio/aclocal.m4	2010-03-03 16:00:15.783632878 +0000
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 +# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
@@ -60819,10 +63577,19 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/aclocal.m4 lustre-1.8.1/libsysio/aclocal.
 -AC_SUBST([am__untar])
 -]) # _AM_PROG_TAR
 -
-diff -Nurwd lustre-1.8.1.orig/libsysio/autom4te.cache/output.0 lustre-1.8.1/libsysio/autom4te.cache/output.0
---- lustre-1.8.1.orig/libsysio/autom4te.cache/output.0	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/libsysio/autom4te.cache/output.0	2009-09-10 11:17:09.000000000 +0200
-@@ -0,0 +1,6701 @@
+diff -Nurwd orig/lustre-1.8.2/libsysio/autogen.sh lustre-1.8.2/libsysio/autogen.sh
+--- orig/lustre-1.8.2/libsysio/autogen.sh	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/libsysio/autogen.sh	2010-03-03 15:57:14.819658335 +0000
+@@ -0,0 +1,5 @@
++#!/bin/sh
++
++aclocal &&
++automake --add-missing --copy &&
++${AUTOCONF:-autoconf}
+diff -Nurwd orig/lustre-1.8.2/libsysio/autom4te.cache/output.0 lustre-1.8.2/libsysio/autom4te.cache/output.0
+--- orig/lustre-1.8.2/libsysio/autom4te.cache/output.0	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/libsysio/autom4te.cache/output.0	2010-03-03 16:00:16.391632779 +0000
+@@ -0,0 +1,6840 @@
 +@%:@! /bin/sh
 +@%:@ Guess values for system-dependent variables and create Makefiles.
 +@%:@ Generated by GNU Autoconf 2.61 for libsysio 1.2.
@@ -66024,6 +68791,145 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/autom4te.cache/output.0 lustre-1.8.1/libs
 +
 +fi
 +
++{ echo "$as_me:$LINENO: checking for POSIX 2008 preadv" >&5
++echo $ECHO_N "checking for POSIX 2008 preadv... $ECHO_C" >&6; }
++tmp_flags="$CFLAGS"
++CFLAGS="$CFLAGS -Wall -Werror"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/uio.h>
++ssize_t preadv (int __fd, const struct iovec *__iovec,
++                int __count, off_t off)
++{
++    return 0;
++}
++
++int
++main ()
++{
++
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  
++
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_POSIX2008_PREADV 1
++_ACEOF
++
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	
++{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS="$tmp_flags"
++
++{ echo "$as_me:$LINENO: checking for POSIX 2008 scandir" >&5
++echo $ECHO_N "checking for POSIX 2008 scandir... $ECHO_C" >&6; }
++tmp_flags="$CFLAGS"
++CFLAGS="$CFLAGS -Wall -Werror"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#define _BSD_SOURCE
++
++#include <stdio.h>
++#include <dirent.h>
++
++int scandir(const char *dir,
++	 struct dirent ***namelist,
++	 int(*filter)(const struct dirent *),
++	 int(*compar)(const struct dirent **,
++	              const struct dirent **)
++	);
++
++
++int
++main ()
++{
++
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  
++
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_POSIX2008_SCANDIR 1
++_ACEOF
++
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; } 
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	
++{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS="$tmp_flags"
++
++
 +{ echo "$as_me:$LINENO: checking whether .text pseudo-op must be used" >&5
 +echo $ECHO_N "checking whether .text pseudo-op must be used... $ECHO_C" >&6; }
 +if test "${am_cv_sysio_asm_dot_text+set}" = set; then
@@ -67524,11 +70430,11 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/autom4te.cache/output.0 lustre-1.8.1/libs
 +fi
 +
 +
-diff -Nurwd lustre-1.8.1.orig/libsysio/autom4te.cache/requests lustre-1.8.1/libsysio/autom4te.cache/requests
---- lustre-1.8.1.orig/libsysio/autom4te.cache/requests	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/libsysio/autom4te.cache/requests	2009-09-10 11:17:12.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/libsysio/autom4te.cache/requests lustre-1.8.2/libsysio/autom4te.cache/requests
+--- orig/lustre-1.8.2/libsysio/autom4te.cache/requests	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/libsysio/autom4te.cache/requests	2010-03-03 16:00:17.299633935 +0000
 @@ -0,0 +1,64 @@
-+# This file was generated by Autom4te Wed Jan 17 19:57:31 PST 2007.
++# This file was generated by Autom4te Mon Aug 11 20:59:21 PDT 2008.
 +# It contains the lists of macros which have been traced.
 +# It can be safely removed.
 +
@@ -67592,10 +70498,10 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/autom4te.cache/requests lustre-1.8.1/libs
 +                    ], 'Autom4te::Request' )
 +           );
 +
-diff -Nurwd lustre-1.8.1.orig/libsysio/autom4te.cache/traces.0 lustre-1.8.1/libsysio/autom4te.cache/traces.0
---- lustre-1.8.1.orig/libsysio/autom4te.cache/traces.0	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.8.1/libsysio/autom4te.cache/traces.0	2009-09-10 11:17:09.000000000 +0200
-@@ -0,0 +1,595 @@
+diff -Nurwd orig/lustre-1.8.2/libsysio/autom4te.cache/traces.0 lustre-1.8.2/libsysio/autom4te.cache/traces.0
+--- orig/lustre-1.8.2/libsysio/autom4te.cache/traces.0	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/libsysio/autom4te.cache/traces.0	2010-03-03 16:00:16.391632779 +0000
+@@ -0,0 +1,609 @@
 +m4trace:aclocal.m4:43: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
 +m4trace:configure.in:1: -1- AC_INIT([libsysio], [1.2])
 +m4trace:configure.in:1: -1- m4_pattern_forbid([^_?A[CHUM]_])
@@ -68156,44 +71062,58 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/autom4te.cache/traces.0 lustre-1.8.1/libs
 +configure.in:352: the top level])
 +m4trace:configure.in:360: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GENERATION])
 +m4trace:configure.in:360: -1- m4_pattern_allow([^HAVE_GENERATION$])
-+m4trace:configure.in:400: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete.
++m4trace:configure.in:366: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
++configure.in:366: the top level])
++m4trace:configure.in:366: -1- AC_DEFINE_TRACE_LITERAL([HAVE_POSIX2008_PREADV])
++m4trace:configure.in:366: -1- m4_pattern_allow([^HAVE_POSIX2008_PREADV$])
++m4trace:configure.in:366: -1- AH_OUTPUT([HAVE_POSIX2008_PREADV], [/* POSIX 2008 preadv */
++#undef HAVE_POSIX2008_PREADV])
++m4trace:configure.in:385: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
++configure.in:385: the top level])
++m4trace:configure.in:385: -1- AC_DEFINE_TRACE_LITERAL([HAVE_POSIX2008_SCANDIR])
++m4trace:configure.in:385: -1- m4_pattern_allow([^HAVE_POSIX2008_SCANDIR$])
++m4trace:configure.in:385: -1- AH_OUTPUT([HAVE_POSIX2008_SCANDIR], [/* POSIX 2008 scandir */
++#undef HAVE_POSIX2008_SCANDIR])
++m4trace:configure.in:445: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:364: AC_FD_CC is expanded from...
 +../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from...
 +../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from...
 +../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from...
-+configure.in:400: the top level])
-+m4trace:configure.in:400: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete.
++configure.in:445: the top level])
++m4trace:configure.in:445: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete.
 +You should run autoupdate.], [../../lib/autoconf/general.m4:364: AC_FD_CC is expanded from...
 +../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from...
 +../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from...
 +../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from...
-+configure.in:400: the top level])
-+m4trace:configure.in:460: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ASM_WEAK_DIRECTIVE])
-+m4trace:configure.in:460: -1- m4_pattern_allow([^HAVE_ASM_WEAK_DIRECTIVE$])
-+m4trace:configure.in:463: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ASM_WEAKEXT_DIRECTIVE])
-+m4trace:configure.in:463: -1- m4_pattern_allow([^HAVE_ASM_WEAKEXT_DIRECTIVE$])
-+m4trace:configure.in:466: -1- AC_CONFIG_FILES([Makefile
++configure.in:445: the top level])
++m4trace:configure.in:505: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ASM_WEAK_DIRECTIVE])
++m4trace:configure.in:505: -1- m4_pattern_allow([^HAVE_ASM_WEAK_DIRECTIVE$])
++m4trace:configure.in:508: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ASM_WEAKEXT_DIRECTIVE])
++m4trace:configure.in:508: -1- m4_pattern_allow([^HAVE_ASM_WEAKEXT_DIRECTIVE$])
++m4trace:configure.in:511: -1- AC_CONFIG_FILES([Makefile
 +	tests/Makefile])
-+m4trace:configure.in:466: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
++m4trace:configure.in:511: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 +You should run autoupdate.], [])
-+m4trace:configure.in:466: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
-+m4trace:configure.in:466: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-+m4trace:configure.in:466: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([LTLIBOBJS])
-+m4trace:configure.in:466: -1- m4_pattern_allow([^LTLIBOBJS$])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([top_builddir])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([srcdir])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([abs_srcdir])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([top_srcdir])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([abs_top_srcdir])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([builddir])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([abs_builddir])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([abs_top_builddir])
-+m4trace:configure.in:466: -1- AC_SUBST_TRACE([INSTALL])
-diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
---- lustre-1.8.1.orig/libsysio/configure	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/libsysio/configure	2009-09-10 11:17:12.000000000 +0200
++m4trace:configure.in:511: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
++m4trace:configure.in:511: -1- m4_pattern_allow([^LIB@&t at OBJS$])
++m4trace:configure.in:511: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([LTLIBOBJS])
++m4trace:configure.in:511: -1- m4_pattern_allow([^LTLIBOBJS$])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([top_builddir])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([srcdir])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([abs_srcdir])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([top_srcdir])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([abs_top_srcdir])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([builddir])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([abs_builddir])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([abs_top_builddir])
++m4trace:configure.in:511: -1- AC_SUBST_TRACE([INSTALL])
+diff -Nurwd orig/lustre-1.8.2/libsysio/configure lustre-1.8.2/libsysio/configure
+--- orig/lustre-1.8.2/libsysio/configure	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/libsysio/configure	2010-03-03 16:00:17.299633935 +0000
 @@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -73284,6 +76204,147 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  
  fi
  
+-echo "$as_me:$LINENO: checking for POSIX 2008 preadv" >&5
+-echo $ECHO_N "checking for POSIX 2008 preadv... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for POSIX 2008 preadv" >&5
++echo $ECHO_N "checking for POSIX 2008 preadv... $ECHO_C" >&6; }
+ tmp_flags="$CFLAGS"
+ CFLAGS="$CFLAGS -Wall -Werror"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4594,50 +5227,46 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_POSIX2008_PREADV 1
+ _ACEOF
+ 
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$tmp_flags"
+ 
+-echo "$as_me:$LINENO: checking for POSIX 2008 scandir" >&5
+-echo $ECHO_N "checking for POSIX 2008 scandir... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for POSIX 2008 scandir" >&5
++echo $ECHO_N "checking for POSIX 2008 scandir... $ECHO_C" >&6; }
+ tmp_flags="$CFLAGS"
+ CFLAGS="$CFLAGS -Wall -Werror"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4670,51 +5299,47 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_POSIX2008_SCANDIR 1
+ _ACEOF
+ 
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$tmp_flags"
+ 
+ 
 -echo "$as_me:$LINENO: checking whether .text pseudo-op must be used" >&5
 -echo $ECHO_N "checking whether .text pseudo-op must be used... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether .text pseudo-op must be used" >&5
@@ -73291,7 +76352,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  if test "${am_cv_sysio_asm_dot_text+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4582,15 +5215,15 @@
+@@ -4729,15 +5354,15 @@
  fi
  
  if test -z "$am_cv_sysio_asm_dot_text"; then
@@ -73313,7 +76374,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  if test "${am_cv_sysio_asm_global_directive+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4608,8 +5241,8 @@
+@@ -4755,8 +5380,8 @@
  	test $am_cv_sysio_asm_global_directive != UNKNOWN && break
  done
  fi
@@ -73324,7 +76385,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  if test $am_cv_sysio_asm_global_directive = UNKNOWN; then
  	{ { echo "$as_me:$LINENO: error: cannot determine asm global directive" >&5
  echo "$as_me: error: cannot determine asm global directive" >&2;}
-@@ -4618,8 +5251,8 @@
+@@ -4765,8 +5390,8 @@
  #	AC_DEFINE_UNQUOTED(ASM_GLOBAL_DIRECTIVE, ${am_cv_sysio_asm_global_directive})
  fi
  
@@ -73335,7 +76396,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  if test "${am_cv_sysio_asm_set_directive+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4643,14 +5276,14 @@
+@@ -4790,14 +5415,14 @@
  	fi
  	rm -f conftest*
  fi
@@ -73354,7 +76415,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  if test "${am_cv_sysio_asm_weak_directive+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4666,12 +5299,12 @@
+@@ -4813,12 +5438,12 @@
  	fi
  	rm -f conftest*
  fi
@@ -73371,7 +76432,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  if test "${am_cv_sysio_asm_weakext_directive+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4691,8 +5324,8 @@
+@@ -4838,8 +5463,8 @@
  		fi
  		rm -f conftest*
  fi
@@ -73382,7 +76443,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  fi # no .weak
  
  if test x$am_cv_sysio_asm_weak_directive = xyes; then
-@@ -4709,6 +5342,7 @@
+@@ -4856,6 +5481,7 @@
  fi
  
                      ac_config_files="$ac_config_files Makefile tests/Makefile"
@@ -73390,7 +76451,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -4727,39 +5361,58 @@
+@@ -4874,39 +5500,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -73463,7 +76524,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
    fi
  fi
  rm -f confcache
-@@ -4768,63 +5421,48 @@
+@@ -4915,63 +5560,48 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -73551,7 +76612,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  done
  LIBOBJS=$ac_libobjs
  
-@@ -4946,73 +5584,26 @@
+@@ -5093,73 +5723,26 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
@@ -73572,8 +76633,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
 -# Support unset when possible.
 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 -  as_unset=unset
-+  setopt NO_GLOB_SUBST
- else
+-else
 -  as_unset=false
 -fi
 -
@@ -73583,10 +76643,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
 -PS1='$ '
 -PS2='> '
 -PS4='+ '
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
- 
+-
 -# NLS nuisances.
 -for as_var in \
 -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
@@ -73597,21 +76654,25 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
 -    eval $as_var=C; export $as_var
 -  else
 -    $as_unset $as_var
-   fi
+-  fi
 -done
- 
+-
 -# Required to use basename.
 -if expr a : '\(a\)' >/dev/null 2>&1; then
 -  as_expr=expr
--else
++  setopt NO_GLOB_SUBST
+ else
 -  as_expr=false
 -fi
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
  
 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
 -  as_basename=basename
 -else
 -  as_basename=false
--fi
+ fi
  
  
 -# Name of the executable.
@@ -73625,14 +76686,14 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
 -  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
--
--
+ 
+ 
 -# PATH needs CR, and LINENO needs CR and PATH.
 +# PATH needs CR
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -5033,14 +5624,24 @@
+@@ -5180,14 +5763,24 @@
    rm -f conf$$.sh
  fi
  
@@ -73664,7 +76725,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
    case $0 in
      *[\\/]* ) as_myself=$0 ;;
      *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5050,6 +5651,7 @@
+@@ -5197,6 +5790,7 @@
    test -z "$as_dir" && as_dir=.
    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  done
@@ -73672,7 +76733,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  
         ;;
    esac
-@@ -5059,100 +5661,161 @@
+@@ -5206,100 +5800,161 @@
      as_myself=$0
    fi
    if test ! -f "$as_myself"; then
@@ -73889,7 +76950,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -5161,7 +5824,28 @@
+@@ -5308,7 +5963,28 @@
    as_mkdir_p=false
  fi
  
@@ -73919,7 +76980,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -5170,31 +5854,14 @@
+@@ -5317,31 +5993,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -73955,7 +77016,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -5202,30 +5869,19 @@
+@@ -5349,30 +6008,19 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -73993,7 +77054,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -5233,7 +5889,7 @@
+@@ -5380,7 +6028,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -74002,7 +77063,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -5247,19 +5903,21 @@
+@@ -5394,19 +6042,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -74030,7 +77091,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -5270,60 +5928,42 @@
+@@ -5417,60 +6067,42 @@
  do
    case $1 in
    --*=*)
@@ -74103,7 +77164,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  
    esac
    shift
-@@ -5339,37 +5979,49 @@
+@@ -5486,37 +6118,49 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -74162,7 +77223,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -5380,364 +6032,468 @@
+@@ -5527,364 +6171,468 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -74922,7 +77983,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -5745,142 +6501,43 @@
+@@ -5892,142 +6640,43 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -75095,7 +78156,7 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -5890,86 +6547,129 @@
+@@ -6037,86 +6686,129 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -75272,1831 +78333,9 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/configure lustre-1.8.1/libsysio/configure
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -Nurwd lustre-1.8.1.orig/libsysio/Makefile.in lustre-1.8.1/libsysio/Makefile.in
---- lustre-1.8.1.orig/libsysio/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/libsysio/Makefile.in	2009-09-10 11:17:10.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-+# Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -26,6 +26,7 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
-+
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -42,107 +43,6 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
--	$(srcdir)/Makefile.in $(top_srcdir)/Rules.make \
--	$(top_srcdir)/configure $(top_srcdir)/dev/stdfd/module.mk \
--	$(top_srcdir)/drivers/incore/module.mk \
--	$(top_srcdir)/drivers/native/module.mk \
--	$(top_srcdir)/drivers/sockets/module.mk \
--	$(top_srcdir)/drivers/yod/module.mk \
--	$(top_srcdir)/include/module.mk $(top_srcdir)/src/module.mk \
--	$(top_srcdir)/tests/module.mk AUTHORS COPYING ChangeLog \
--	INSTALL NEWS compile config.guess config.sub depcomp \
--	install-sh missing mkinstalldirs
--subdir = .
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.in
--am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
--	$(ACLOCAL_M4)
--am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno configure.status.lineno
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
--    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
--    *) f=$$p;; \
--  esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)"
--libLIBRARIES_INSTALL = $(INSTALL_DATA)
--LIBRARIES = $(lib_LIBRARIES)
--AR = ar
--ARFLAGS = cru
--__LIBBUILD_DIR__libsysio_a_AR = $(AR) $(ARFLAGS)
--__LIBBUILD_DIR__libsysio_a_LIBADD =
--am____LIBBUILD_DIR__libsysio_a_SOURCES_DIST = src/access.c src/chdir.c \
--	src/chmod.c src/chown.c src/dev.c src/dup.c src/fcntl.c \
--	src/fs.c src/fsync.c src/getdirentries.c src/init.c \
--	src/inode.c src/ioctl.c src/ioctx.c src/iowait.c src/link.c \
--	src/lseek.c src/mkdir.c src/mknod.c src/mount.c src/namei.c \
--	src/open.c src/rw.c src/reconcile.c src/rename.c src/rmdir.c \
--	src/stat64.c src/stat.c src/stddir.c src/readdir.c \
--	src/readdir64.c src/symlink.c src/readlink.c src/truncate.c \
--	src/unlink.c src/utime.c src/file.c src/file_hack.c \
--	src/stdlib.c dev/stdfd/stdfd.c drivers/incore/fs_incore.c \
--	drivers/sockets/sockets.c drivers/native/fs_native.c \
--	drivers/yod/fs_yod.c
--am__dirstamp = $(am__leading_dot)dirstamp
-- at WITH_LUSTRE_HACK_FALSE@am__objects_1 = src/file.$(OBJEXT)
-- at WITH_LUSTRE_HACK_TRUE@am__objects_1 = src/file_hack.$(OBJEXT)
-- at WITH_LUSTRE_HACK_TRUE@am__objects_2 = src/stdlib.$(OBJEXT)
--am__objects_3 = src/access.$(OBJEXT) src/chdir.$(OBJEXT) \
--	src/chmod.$(OBJEXT) src/chown.$(OBJEXT) src/dev.$(OBJEXT) \
--	src/dup.$(OBJEXT) src/fcntl.$(OBJEXT) src/fs.$(OBJEXT) \
--	src/fsync.$(OBJEXT) src/getdirentries.$(OBJEXT) \
--	src/init.$(OBJEXT) src/inode.$(OBJEXT) src/ioctl.$(OBJEXT) \
--	src/ioctx.$(OBJEXT) src/iowait.$(OBJEXT) src/link.$(OBJEXT) \
--	src/lseek.$(OBJEXT) src/mkdir.$(OBJEXT) src/mknod.$(OBJEXT) \
--	src/mount.$(OBJEXT) src/namei.$(OBJEXT) src/open.$(OBJEXT) \
--	src/rw.$(OBJEXT) src/reconcile.$(OBJEXT) src/rename.$(OBJEXT) \
--	src/rmdir.$(OBJEXT) src/stat64.$(OBJEXT) src/stat.$(OBJEXT) \
--	src/stddir.$(OBJEXT) src/readdir.$(OBJEXT) \
--	src/readdir64.$(OBJEXT) src/symlink.$(OBJEXT) \
--	src/readlink.$(OBJEXT) src/truncate.$(OBJEXT) \
--	src/unlink.$(OBJEXT) src/utime.$(OBJEXT) $(am__objects_1) \
--	$(am__objects_2)
--am__objects_4 = dev/stdfd/stdfd.$(OBJEXT)
-- at WITH_STDFD_DEV_TRUE@am__objects_5 = $(am__objects_4)
--am__objects_6 = drivers/incore/fs_incore.$(OBJEXT)
-- at WITH_INCORE_DRIVER_TRUE@am__objects_7 = $(am__objects_6)
--am__objects_8 = drivers/sockets/sockets.$(OBJEXT)
-- at WITH_SOCKETS_DRIVER_TRUE@am__objects_9 = $(am__objects_8)
--am__objects_10 = drivers/native/fs_native.$(OBJEXT)
-- at WITH_NATIVE_DRIVER_TRUE@am__objects_11 = $(am__objects_10)
-- at WITH_CPLANT_YOD_TRUE@am__objects_12 = drivers/yod/fs_yod.$(OBJEXT)
-- at WITH_CPLANT_YOD_TRUE@am__objects_13 = $(am__objects_12)
--am___LIBBUILD_DIR__libsysio_a_OBJECTS = $(am__objects_3) \
--	$(am__objects_5) $(am__objects_7) $(am__objects_9) \
--	$(am__objects_11) $(am__objects_13)
--__LIBBUILD_DIR__libsysio_a_OBJECTS =  \
--	$(am___LIBBUILD_DIR__libsysio_a_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir)
--depcomp = $(SHELL) $(top_srcdir)/depcomp
--am__depfiles_maybe = depfiles
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(__LIBBUILD_DIR__libsysio_a_SOURCES)
--DIST_SOURCES = $(am____LIBBUILD_DIR__libsysio_a_SOURCES_DIST)
--ETAGS = etags
--CTAGS = ctags
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--distdir = $(PACKAGE)-$(VERSION)
--top_distdir = $(distdir)
--am__remove_distdir = \
--  { test ! -d $(distdir) \
--    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
--         && rm -fr $(distdir); }; }
--DIST_ARCHIVES = $(distdir).tar.gz
--GZIP_ENV = --best
--distuninstallcheck_listfiles = find . -type f -print
--distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -166,6 +66,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -211,15 +112,11 @@
- WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- ZERO_SUM_MEMORY = @ZERO_SUM_MEMORY@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -227,23 +124,29 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
--mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -253,12 +156,16 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = 1.6
-- at WITH_TESTS_FALSE@TESTDIR = 
-+
- @WITH_TESTS_TRUE at TESTDIR = tests
-- at WITH_LUSTRE_HACK_FALSE@FILE_SUPPORT = src/file.c
-+ at WITH_TESTS_FALSE@TESTDIR = 
-+
- @WITH_LUSTRE_HACK_TRUE at FILE_SUPPORT = src/file_hack.c
-- at WITH_LUSTRE_HACK_FALSE@LUSTRE_SRCDIR_SRCS = 
-+ at WITH_LUSTRE_HACK_FALSE@FILE_SUPPORT = src/file.c
-+
- @WITH_LUSTRE_HACK_TRUE at LUSTRE_SRCDIR_SRCS = src/stdlib.c
-+ at WITH_LUSTRE_HACK_FALSE@LUSTRE_SRCDIR_SRCS = 
-+
- SRCDIR_SRCS = src/access.c src/chdir.c src/chmod.c \
- 	src/chown.c src/dev.c src/dup.c src/fcntl.c \
- 	src/fs.c src/fsync.c \
-@@ -273,6 +180,7 @@
- 	src/truncate.c src/unlink.c src/utime.c \
- 	$(FILE_SUPPORT) $(LUSTRE_SRCDIR_SRCS)
- 
-+
- SRCDIR_EXTRA = src/module.mk
- INCLUDE_EXTRA = include/dev.h include/file.h include/fs.h \
- 	include/inode.h include/mount.h include/sysio.h include/sysio-cmn.h \
-@@ -298,21 +206,29 @@
- YOD_EXTRA = include/cplant-yod.h drivers/yod/fs_yod.h drivers/yod/module.mk
- SOCKETS_SRCS = drivers/sockets/sockets.c
- SOCKETS_EXTRA = drivers/sockets/module.mk
-+
- lib_LIBRARIES = ${LIBBUILD_DIR}/libsysio.a
- @WITH_STDFD_DEV_FALSE at OPTIONAL_STDFD_SRCS = 
-+
- @WITH_STDFD_DEV_TRUE at OPTIONAL_STDFD_SRCS = $(STDFD_SRCS)
- @WITH_INCORE_DRIVER_FALSE at OPTIONAL_INCORE_SRCS = 
-+
- @WITH_INCORE_DRIVER_TRUE at OPTIONAL_INCORE_SRCS = $(INCORE_SRCS)
-- at WITH_NATIVE_DRIVER_FALSE@OPTIONAL_NATIVE_SRCS = 
-+
- @WITH_NATIVE_DRIVER_TRUE at OPTIONAL_NATIVE_SRCS = $(NATIVE_SRCS)
-+ at WITH_NATIVE_DRIVER_FALSE@OPTIONAL_NATIVE_SRCS = 
- @WITH_SOCKETS_DRIVER_FALSE at OPTIONAL_SOCKETS_SRCS = 
-+
- @WITH_SOCKETS_DRIVER_TRUE at OPTIONAL_SOCKETS_SRCS = $(SOCKETS_SRCS)
- @WITH_CPLANT_YOD_FALSE at OPTIONAL_YOD_SRCS = 
-+
- @WITH_CPLANT_YOD_TRUE at OPTIONAL_YOD_SRCS = $(YOD_SRCS)
- 
- # it would be better that let configure script check this
- @WITH_LUSTRE_HACK_TRUE at OPTIONAL_LUSTRE_CFLAGS = -fPIC
-+
- AM_CFLAGS = $(OPTIONAL_LUSTRE_CFLAGS)
-+
- __LIBBUILD_DIR__libsysio_a_SOURCES = \
- 	$(SRCDIR_SRCS) \
- 	$(OPTIONAL_STDFD_SRCS) \
-@@ -324,90 +240,188 @@
- @WITH_STDFD_DEV_TRUE at STDFD_DEV_CPPFLAGS = -DSTDFD_DEV=1 -I$(top_srcdir)/dev/stdfd
- @WITH_STDFD_DEV_FALSE at STFD_DEV_CPPFLAGS = 
- @WITH_SOCKETS_DRIVER_FALSE at SOCKETS_CPPFLAGS = 
-+
- @WITH_SOCKETS_DRIVER_TRUE at SOCKETS_CPPFLAGS = -DWITH_SOCKETS=1
-+
- DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS)
--AM_CPPFLAGS = $(TRACING) $(AUTOMOUNT) $(ZERO_SUM_MEMORY) \
--	$(DEV_CPPFLAGS) $(SOCKETS_CPPFLAGS) $(DEFER_INIT_CWD) \
--	$(SYSIO_LABEL_NAMES) -I$(top_srcdir)/include \
-+
-+AM_CPPFLAGS = \
-+	$(TRACING) \
-+	$(AUTOMOUNT) $(ZERO_SUM_MEMORY) $(DEV_CPPFLAGS) $(SOCKETS_CPPFLAGS) \
-+	$(DEFER_INIT_CWD) $(SYSIO_LABEL_NAMES) -I$(top_srcdir)/include \
- 	${YOD_DRIVER_FLAGS}
-+
- EXTRA_DIST = Rules.make misc/init-env.sh $(TESTS_EXTRA) $(SRCDIR_EXTRA) \
- 	$(INCLUDE_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \
- 	$(SOCKETS_EXTRA) $(NATIVE_EXTRA) $(YOD_EXTRA)
- 
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+LIBRARIES = $(lib_LIBRARIES)
-+
-+__LIBBUILD_DIR__libsysio_a_AR = $(AR) cru
-+__LIBBUILD_DIR__libsysio_a_LIBADD =
-+am____LIBBUILD_DIR__libsysio_a_SOURCES_DIST = src/access.c src/chdir.c \
-+	src/chmod.c src/chown.c src/dev.c src/dup.c src/fcntl.c \
-+	src/fs.c src/fsync.c src/getdirentries.c src/init.c src/inode.c \
-+	src/ioctl.c src/ioctx.c src/iowait.c src/link.c src/lseek.c \
-+	src/mkdir.c src/mknod.c src/mount.c src/namei.c src/open.c \
-+	src/rw.c src/reconcile.c src/rename.c src/rmdir.c src/stat64.c \
-+	src/stat.c src/stddir.c src/readdir.c src/readdir64.c \
-+	src/symlink.c src/readlink.c src/truncate.c src/unlink.c \
-+	src/utime.c src/file_hack.c src/file.c src/stdlib.c \
-+	dev/stdfd/stdfd.c drivers/incore/fs_incore.c \
-+	drivers/sockets/sockets.c drivers/native/fs_native.c \
-+	drivers/yod/fs_yod.c
-+am__dirstamp = $(am__leading_dot)dirstamp
-+ at WITH_LUSTRE_HACK_TRUE@am__objects_1 = src/file_hack.$(OBJEXT)
-+ at WITH_LUSTRE_HACK_FALSE@am__objects_1 = src/file.$(OBJEXT)
-+ at WITH_LUSTRE_HACK_TRUE@am__objects_2 = src/stdlib.$(OBJEXT)
-+ at WITH_LUSTRE_HACK_FALSE@am__objects_2 =
-+am__objects_3 = src/access.$(OBJEXT) src/chdir.$(OBJEXT) \
-+	src/chmod.$(OBJEXT) src/chown.$(OBJEXT) src/dev.$(OBJEXT) \
-+	src/dup.$(OBJEXT) src/fcntl.$(OBJEXT) src/fs.$(OBJEXT) \
-+	src/fsync.$(OBJEXT) src/getdirentries.$(OBJEXT) \
-+	src/init.$(OBJEXT) src/inode.$(OBJEXT) src/ioctl.$(OBJEXT) \
-+	src/ioctx.$(OBJEXT) src/iowait.$(OBJEXT) src/link.$(OBJEXT) \
-+	src/lseek.$(OBJEXT) src/mkdir.$(OBJEXT) src/mknod.$(OBJEXT) \
-+	src/mount.$(OBJEXT) src/namei.$(OBJEXT) src/open.$(OBJEXT) \
-+	src/rw.$(OBJEXT) src/reconcile.$(OBJEXT) src/rename.$(OBJEXT) \
-+	src/rmdir.$(OBJEXT) src/stat64.$(OBJEXT) src/stat.$(OBJEXT) \
-+	src/stddir.$(OBJEXT) src/readdir.$(OBJEXT) \
-+	src/readdir64.$(OBJEXT) src/symlink.$(OBJEXT) \
-+	src/readlink.$(OBJEXT) src/truncate.$(OBJEXT) \
-+	src/unlink.$(OBJEXT) src/utime.$(OBJEXT) $(am__objects_1) \
-+	$(am__objects_2)
-+am__objects_4 = dev/stdfd/stdfd.$(OBJEXT)
-+ at WITH_STDFD_DEV_TRUE@am__objects_5 = $(am__objects_4)
-+ at WITH_STDFD_DEV_FALSE@am__objects_5 =
-+am__objects_6 = drivers/incore/fs_incore.$(OBJEXT)
-+ at WITH_INCORE_DRIVER_TRUE@am__objects_7 = $(am__objects_6)
-+ at WITH_INCORE_DRIVER_FALSE@am__objects_7 =
-+am__objects_8 = drivers/sockets/sockets.$(OBJEXT)
-+ at WITH_SOCKETS_DRIVER_TRUE@am__objects_9 = $(am__objects_8)
-+ at WITH_SOCKETS_DRIVER_FALSE@am__objects_9 =
-+am__objects_10 = drivers/native/fs_native.$(OBJEXT)
-+ at WITH_NATIVE_DRIVER_TRUE@am__objects_11 = $(am__objects_10)
-+ at WITH_NATIVE_DRIVER_FALSE@am__objects_11 =
-+ at WITH_CPLANT_YOD_TRUE@am__objects_12 = drivers/yod/fs_yod.$(OBJEXT)
-+ at WITH_CPLANT_YOD_FALSE@am__objects_12 =
-+ at WITH_CPLANT_YOD_TRUE@am__objects_13 = $(am__objects_12)
-+ at WITH_CPLANT_YOD_FALSE@am__objects_13 =
-+am___LIBBUILD_DIR__libsysio_a_OBJECTS = $(am__objects_3) \
-+	$(am__objects_5) $(am__objects_7) $(am__objects_9) \
-+	$(am__objects_11) $(am__objects_13)
-+__LIBBUILD_DIR__libsysio_a_OBJECTS = \
-+	$(am___LIBBUILD_DIR__libsysio_a_OBJECTS)
-+
-+DEFAULT_INCLUDES =  -I. -I$(srcdir)
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+ at AMDEP_TRUE@DEP_FILES = dev/stdfd/$(DEPDIR)/stdfd.Po \
-+ at AMDEP_TRUE@	drivers/incore/$(DEPDIR)/fs_incore.Po \
-+ at AMDEP_TRUE@	drivers/native/$(DEPDIR)/fs_native.Po \
-+ at AMDEP_TRUE@	drivers/sockets/$(DEPDIR)/sockets.Po \
-+ at AMDEP_TRUE@	drivers/yod/$(DEPDIR)/fs_yod.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/access.Po src/$(DEPDIR)/chdir.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/chmod.Po src/$(DEPDIR)/chown.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/dev.Po src/$(DEPDIR)/dup.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/fcntl.Po src/$(DEPDIR)/file.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/file_hack.Po src/$(DEPDIR)/fs.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/fsync.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/getdirentries.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/init.Po src/$(DEPDIR)/inode.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/ioctl.Po src/$(DEPDIR)/ioctx.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/iowait.Po src/$(DEPDIR)/link.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/lseek.Po src/$(DEPDIR)/mkdir.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/mknod.Po src/$(DEPDIR)/mount.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/namei.Po src/$(DEPDIR)/open.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/readdir.Po src/$(DEPDIR)/readdir64.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/readlink.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/reconcile.Po src/$(DEPDIR)/rename.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/rmdir.Po src/$(DEPDIR)/rw.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/stat.Po src/$(DEPDIR)/stat64.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/stddir.Po src/$(DEPDIR)/stdlib.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/symlink.Po src/$(DEPDIR)/truncate.Po \
-+ at AMDEP_TRUE@	src/$(DEPDIR)/unlink.Po src/$(DEPDIR)/utime.Po
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+DIST_SOURCES = $(am____LIBBUILD_DIR__libsysio_a_SOURCES_DIST)
-+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \
-+	$(top_srcdir)/Rules.make $(top_srcdir)/dev/stdfd/module.mk \
-+	$(top_srcdir)/drivers/incore/module.mk \
-+	$(top_srcdir)/drivers/native/module.mk \
-+	$(top_srcdir)/drivers/sockets/module.mk \
-+	$(top_srcdir)/drivers/yod/module.mk \
-+	$(top_srcdir)/include/module.mk $(top_srcdir)/src/module.mk \
-+	$(top_srcdir)/tests/module.mk AUTHORS COPYING ChangeLog INSTALL \
-+	Makefile.am NEWS aclocal.m4 compile config.guess config.sub \
-+	configure configure.in depcomp install-sh missing mkinstalldirs
-+SOURCES = $(__LIBBUILD_DIR__libsysio_a_SOURCES)
-+
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o .obj
--am--refresh:
--	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/module.mk $(top_srcdir)/include/module.mk $(top_srcdir)/tests/module.mk $(top_srcdir)/dev/stdfd/module.mk $(top_srcdir)/drivers/incore/module.mk $(top_srcdir)/drivers/native/module.mk $(top_srcdir)/drivers/yod/module.mk $(top_srcdir)/drivers/sockets/module.mk $(top_srcdir)/Rules.make $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
--	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
--		&& exit 0; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-+
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno
-+$(srcdir)/Makefile.in:  Makefile.am $(top_srcdir)/src/module.mk $(top_srcdir)/include/module.mk $(top_srcdir)/tests/module.mk $(top_srcdir)/dev/stdfd/module.mk $(top_srcdir)/drivers/incore/module.mk $(top_srcdir)/drivers/native/module.mk $(top_srcdir)/drivers/yod/module.mk $(top_srcdir)/drivers/sockets/module.mk $(top_srcdir)/Rules.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  Makefile
--.PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    echo ' $(SHELL) ./config.status'; \
--	    $(SHELL) ./config.status;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
--	esac;
-+	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
- 
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
--
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- 	cd $(srcdir) && $(AUTOCONF)
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+
-+$(ACLOCAL_M4):  configure.in 
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+
-+AR = ar
-+libLIBRARIES_INSTALL = $(INSTALL_DATA)
- install-libLIBRARIES: $(lib_LIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    f=$(am__strip_dir) \
--	    echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
-+	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
- 	  else :; fi; \
- 	done
- 	@$(POST_INSTALL)
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    p=$(am__strip_dir) \
--	    echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
--	    $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
-+	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-+	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-+	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- 	  else :; fi; \
- 	done
- 
- uninstall-libLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
--	  p=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+	  p="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
-+	  rm -f $(DESTDIR)$(libdir)/$$p; \
- 	done
- 
- clean-libLIBRARIES:
- 	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
- src/$(am__dirstamp):
--	@$(mkdir_p) src
-+	@$(mkinstalldirs) src
- 	@: > src/$(am__dirstamp)
- src/$(DEPDIR)/$(am__dirstamp):
--	@$(mkdir_p) src/$(DEPDIR)
-+	@$(mkinstalldirs) src/$(DEPDIR)
- 	@: > src/$(DEPDIR)/$(am__dirstamp)
--src/access.$(OBJEXT): src/$(am__dirstamp) \
--	src/$(DEPDIR)/$(am__dirstamp)
-+src/access.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/chdir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/chmod.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/chown.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-@@ -422,8 +436,7 @@
- src/inode.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/ioctl.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/ioctx.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
--src/iowait.$(OBJEXT): src/$(am__dirstamp) \
--	src/$(DEPDIR)/$(am__dirstamp)
-+src/iowait.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/link.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/lseek.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/mkdir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-@@ -434,74 +447,67 @@
- src/rw.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/reconcile.$(OBJEXT): src/$(am__dirstamp) \
- 	src/$(DEPDIR)/$(am__dirstamp)
--src/rename.$(OBJEXT): src/$(am__dirstamp) \
--	src/$(DEPDIR)/$(am__dirstamp)
-+src/rename.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/rmdir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
--src/stat64.$(OBJEXT): src/$(am__dirstamp) \
--	src/$(DEPDIR)/$(am__dirstamp)
-+src/stat64.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/stat.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
--src/stddir.$(OBJEXT): src/$(am__dirstamp) \
--	src/$(DEPDIR)/$(am__dirstamp)
--src/readdir.$(OBJEXT): src/$(am__dirstamp) \
--	src/$(DEPDIR)/$(am__dirstamp)
-+src/stddir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-+src/readdir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/readdir64.$(OBJEXT): src/$(am__dirstamp) \
- 	src/$(DEPDIR)/$(am__dirstamp)
--src/symlink.$(OBJEXT): src/$(am__dirstamp) \
--	src/$(DEPDIR)/$(am__dirstamp)
-+src/symlink.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/readlink.$(OBJEXT): src/$(am__dirstamp) \
- 	src/$(DEPDIR)/$(am__dirstamp)
- src/truncate.$(OBJEXT): src/$(am__dirstamp) \
- 	src/$(DEPDIR)/$(am__dirstamp)
--src/unlink.$(OBJEXT): src/$(am__dirstamp) \
--	src/$(DEPDIR)/$(am__dirstamp)
-+src/unlink.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/utime.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
--src/file.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- src/file_hack.$(OBJEXT): src/$(am__dirstamp) \
- 	src/$(DEPDIR)/$(am__dirstamp)
--src/stdlib.$(OBJEXT): src/$(am__dirstamp) \
--	src/$(DEPDIR)/$(am__dirstamp)
-+src/file.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-+src/stdlib.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
- dev/stdfd/$(am__dirstamp):
--	@$(mkdir_p) dev/stdfd
-+	@$(mkinstalldirs) dev/stdfd
- 	@: > dev/stdfd/$(am__dirstamp)
- dev/stdfd/$(DEPDIR)/$(am__dirstamp):
--	@$(mkdir_p) dev/stdfd/$(DEPDIR)
-+	@$(mkinstalldirs) dev/stdfd/$(DEPDIR)
- 	@: > dev/stdfd/$(DEPDIR)/$(am__dirstamp)
- dev/stdfd/stdfd.$(OBJEXT): dev/stdfd/$(am__dirstamp) \
- 	dev/stdfd/$(DEPDIR)/$(am__dirstamp)
- drivers/incore/$(am__dirstamp):
--	@$(mkdir_p) drivers/incore
-+	@$(mkinstalldirs) drivers/incore
- 	@: > drivers/incore/$(am__dirstamp)
- drivers/incore/$(DEPDIR)/$(am__dirstamp):
--	@$(mkdir_p) drivers/incore/$(DEPDIR)
-+	@$(mkinstalldirs) drivers/incore/$(DEPDIR)
- 	@: > drivers/incore/$(DEPDIR)/$(am__dirstamp)
- drivers/incore/fs_incore.$(OBJEXT): drivers/incore/$(am__dirstamp) \
- 	drivers/incore/$(DEPDIR)/$(am__dirstamp)
- drivers/sockets/$(am__dirstamp):
--	@$(mkdir_p) drivers/sockets
-+	@$(mkinstalldirs) drivers/sockets
- 	@: > drivers/sockets/$(am__dirstamp)
- drivers/sockets/$(DEPDIR)/$(am__dirstamp):
--	@$(mkdir_p) drivers/sockets/$(DEPDIR)
-+	@$(mkinstalldirs) drivers/sockets/$(DEPDIR)
- 	@: > drivers/sockets/$(DEPDIR)/$(am__dirstamp)
- drivers/sockets/sockets.$(OBJEXT): drivers/sockets/$(am__dirstamp) \
- 	drivers/sockets/$(DEPDIR)/$(am__dirstamp)
- drivers/native/$(am__dirstamp):
--	@$(mkdir_p) drivers/native
-+	@$(mkinstalldirs) drivers/native
- 	@: > drivers/native/$(am__dirstamp)
- drivers/native/$(DEPDIR)/$(am__dirstamp):
--	@$(mkdir_p) drivers/native/$(DEPDIR)
-+	@$(mkinstalldirs) drivers/native/$(DEPDIR)
- 	@: > drivers/native/$(DEPDIR)/$(am__dirstamp)
- drivers/native/fs_native.$(OBJEXT): drivers/native/$(am__dirstamp) \
- 	drivers/native/$(DEPDIR)/$(am__dirstamp)
- drivers/yod/$(am__dirstamp):
--	@$(mkdir_p) drivers/yod
-+	@$(mkinstalldirs) drivers/yod
- 	@: > drivers/yod/$(am__dirstamp)
- drivers/yod/$(DEPDIR)/$(am__dirstamp):
--	@$(mkdir_p) drivers/yod/$(DEPDIR)
-+	@$(mkinstalldirs) drivers/yod/$(DEPDIR)
- 	@: > drivers/yod/$(DEPDIR)/$(am__dirstamp)
- drivers/yod/fs_yod.$(OBJEXT): drivers/yod/$(am__dirstamp) \
- 	drivers/yod/$(DEPDIR)/$(am__dirstamp)
- ${LIBBUILD_DIR}/$(am__dirstamp):
--	@$(mkdir_p) ${LIBBUILD_DIR}
-+	@$(mkinstalldirs) ${LIBBUILD_DIR}
- 	@: > ${LIBBUILD_DIR}/$(am__dirstamp)
- ${LIBBUILD_DIR}/libsysio.a: $(__LIBBUILD_DIR__libsysio_a_OBJECTS) $(__LIBBUILD_DIR__libsysio_a_DEPENDENCIES) ${LIBBUILD_DIR}/$(am__dirstamp)
- 	-rm -f ${LIBBUILD_DIR}/libsysio.a
-@@ -509,7 +515,7 @@
- 	$(RANLIB) ${LIBBUILD_DIR}/libsysio.a
- 
- mostlyclean-compile:
--	-rm -f *.$(OBJEXT)
-+	-rm -f *.$(OBJEXT) core *.core
- 	-rm -f dev/stdfd/stdfd.$(OBJEXT)
- 	-rm -f drivers/incore/fs_incore.$(OBJEXT)
- 	-rm -f drivers/native/fs_native.$(OBJEXT)
-@@ -604,22 +610,1004 @@
- @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/utime.Po at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+
-+src/access.o: src/access.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/access.o -MD -MP -MF "src/$(DEPDIR)/access.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/access.o `test -f 'src/access.c' || echo '$(srcdir)/'`src/access.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/access.Tpo" "src/$(DEPDIR)/access.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/access.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/access.c' object='src/access.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/access.Po' tmpdepfile='src/$(DEPDIR)/access.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/access.o `test -f 'src/access.c' || echo '$(srcdir)/'`src/access.c
-+
-+src/access.obj: src/access.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/access.obj -MD -MP -MF "src/$(DEPDIR)/access.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/access.obj `if test -f 'src/access.c'; then $(CYGPATH_W) 'src/access.c'; else $(CYGPATH_W) '$(srcdir)/src/access.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/access.Tpo" "src/$(DEPDIR)/access.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/access.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/access.c' object='src/access.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/access.Po' tmpdepfile='src/$(DEPDIR)/access.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/access.obj `if test -f 'src/access.c'; then $(CYGPATH_W) 'src/access.c'; else $(CYGPATH_W) '$(srcdir)/src/access.c'; fi`
-+
-+src/chdir.o: src/chdir.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chdir.o -MD -MP -MF "src/$(DEPDIR)/chdir.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/chdir.o `test -f 'src/chdir.c' || echo '$(srcdir)/'`src/chdir.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chdir.Tpo" "src/$(DEPDIR)/chdir.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chdir.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chdir.c' object='src/chdir.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chdir.Po' tmpdepfile='src/$(DEPDIR)/chdir.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chdir.o `test -f 'src/chdir.c' || echo '$(srcdir)/'`src/chdir.c
-+
-+src/chdir.obj: src/chdir.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chdir.obj -MD -MP -MF "src/$(DEPDIR)/chdir.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/chdir.obj `if test -f 'src/chdir.c'; then $(CYGPATH_W) 'src/chdir.c'; else $(CYGPATH_W) '$(srcdir)/src/chdir.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chdir.Tpo" "src/$(DEPDIR)/chdir.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chdir.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chdir.c' object='src/chdir.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chdir.Po' tmpdepfile='src/$(DEPDIR)/chdir.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chdir.obj `if test -f 'src/chdir.c'; then $(CYGPATH_W) 'src/chdir.c'; else $(CYGPATH_W) '$(srcdir)/src/chdir.c'; fi`
-+
-+src/chmod.o: src/chmod.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chmod.o -MD -MP -MF "src/$(DEPDIR)/chmod.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/chmod.o `test -f 'src/chmod.c' || echo '$(srcdir)/'`src/chmod.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chmod.Tpo" "src/$(DEPDIR)/chmod.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chmod.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chmod.c' object='src/chmod.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chmod.Po' tmpdepfile='src/$(DEPDIR)/chmod.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chmod.o `test -f 'src/chmod.c' || echo '$(srcdir)/'`src/chmod.c
-+
-+src/chmod.obj: src/chmod.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chmod.obj -MD -MP -MF "src/$(DEPDIR)/chmod.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/chmod.obj `if test -f 'src/chmod.c'; then $(CYGPATH_W) 'src/chmod.c'; else $(CYGPATH_W) '$(srcdir)/src/chmod.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chmod.Tpo" "src/$(DEPDIR)/chmod.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chmod.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chmod.c' object='src/chmod.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chmod.Po' tmpdepfile='src/$(DEPDIR)/chmod.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chmod.obj `if test -f 'src/chmod.c'; then $(CYGPATH_W) 'src/chmod.c'; else $(CYGPATH_W) '$(srcdir)/src/chmod.c'; fi`
-+
-+src/chown.o: src/chown.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chown.o -MD -MP -MF "src/$(DEPDIR)/chown.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/chown.o `test -f 'src/chown.c' || echo '$(srcdir)/'`src/chown.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chown.Tpo" "src/$(DEPDIR)/chown.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chown.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chown.c' object='src/chown.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chown.Po' tmpdepfile='src/$(DEPDIR)/chown.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chown.o `test -f 'src/chown.c' || echo '$(srcdir)/'`src/chown.c
-+
-+src/chown.obj: src/chown.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/chown.obj -MD -MP -MF "src/$(DEPDIR)/chown.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/chown.obj `if test -f 'src/chown.c'; then $(CYGPATH_W) 'src/chown.c'; else $(CYGPATH_W) '$(srcdir)/src/chown.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/chown.Tpo" "src/$(DEPDIR)/chown.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/chown.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/chown.c' object='src/chown.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/chown.Po' tmpdepfile='src/$(DEPDIR)/chown.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/chown.obj `if test -f 'src/chown.c'; then $(CYGPATH_W) 'src/chown.c'; else $(CYGPATH_W) '$(srcdir)/src/chown.c'; fi`
-+
-+src/dev.o: src/dev.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dev.o -MD -MP -MF "src/$(DEPDIR)/dev.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/dev.o `test -f 'src/dev.c' || echo '$(srcdir)/'`src/dev.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/dev.Tpo" "src/$(DEPDIR)/dev.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/dev.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/dev.c' object='src/dev.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/dev.Po' tmpdepfile='src/$(DEPDIR)/dev.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dev.o `test -f 'src/dev.c' || echo '$(srcdir)/'`src/dev.c
-+
-+src/dev.obj: src/dev.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dev.obj -MD -MP -MF "src/$(DEPDIR)/dev.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/dev.obj `if test -f 'src/dev.c'; then $(CYGPATH_W) 'src/dev.c'; else $(CYGPATH_W) '$(srcdir)/src/dev.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/dev.Tpo" "src/$(DEPDIR)/dev.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/dev.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/dev.c' object='src/dev.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/dev.Po' tmpdepfile='src/$(DEPDIR)/dev.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dev.obj `if test -f 'src/dev.c'; then $(CYGPATH_W) 'src/dev.c'; else $(CYGPATH_W) '$(srcdir)/src/dev.c'; fi`
-+
-+src/dup.o: src/dup.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dup.o -MD -MP -MF "src/$(DEPDIR)/dup.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/dup.o `test -f 'src/dup.c' || echo '$(srcdir)/'`src/dup.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/dup.Tpo" "src/$(DEPDIR)/dup.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/dup.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/dup.c' object='src/dup.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/dup.Po' tmpdepfile='src/$(DEPDIR)/dup.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dup.o `test -f 'src/dup.c' || echo '$(srcdir)/'`src/dup.c
-+
-+src/dup.obj: src/dup.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dup.obj -MD -MP -MF "src/$(DEPDIR)/dup.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/dup.obj `if test -f 'src/dup.c'; then $(CYGPATH_W) 'src/dup.c'; else $(CYGPATH_W) '$(srcdir)/src/dup.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/dup.Tpo" "src/$(DEPDIR)/dup.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/dup.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/dup.c' object='src/dup.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/dup.Po' tmpdepfile='src/$(DEPDIR)/dup.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dup.obj `if test -f 'src/dup.c'; then $(CYGPATH_W) 'src/dup.c'; else $(CYGPATH_W) '$(srcdir)/src/dup.c'; fi`
-+
-+src/fcntl.o: src/fcntl.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fcntl.o -MD -MP -MF "src/$(DEPDIR)/fcntl.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/fcntl.o `test -f 'src/fcntl.c' || echo '$(srcdir)/'`src/fcntl.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fcntl.Tpo" "src/$(DEPDIR)/fcntl.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fcntl.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fcntl.c' object='src/fcntl.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fcntl.Po' tmpdepfile='src/$(DEPDIR)/fcntl.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fcntl.o `test -f 'src/fcntl.c' || echo '$(srcdir)/'`src/fcntl.c
-+
-+src/fcntl.obj: src/fcntl.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fcntl.obj -MD -MP -MF "src/$(DEPDIR)/fcntl.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/fcntl.obj `if test -f 'src/fcntl.c'; then $(CYGPATH_W) 'src/fcntl.c'; else $(CYGPATH_W) '$(srcdir)/src/fcntl.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fcntl.Tpo" "src/$(DEPDIR)/fcntl.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fcntl.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fcntl.c' object='src/fcntl.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fcntl.Po' tmpdepfile='src/$(DEPDIR)/fcntl.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fcntl.obj `if test -f 'src/fcntl.c'; then $(CYGPATH_W) 'src/fcntl.c'; else $(CYGPATH_W) '$(srcdir)/src/fcntl.c'; fi`
-+
-+src/fs.o: src/fs.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fs.o -MD -MP -MF "src/$(DEPDIR)/fs.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/fs.o `test -f 'src/fs.c' || echo '$(srcdir)/'`src/fs.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fs.Tpo" "src/$(DEPDIR)/fs.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fs.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fs.c' object='src/fs.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fs.Po' tmpdepfile='src/$(DEPDIR)/fs.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fs.o `test -f 'src/fs.c' || echo '$(srcdir)/'`src/fs.c
-+
-+src/fs.obj: src/fs.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fs.obj -MD -MP -MF "src/$(DEPDIR)/fs.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/fs.obj `if test -f 'src/fs.c'; then $(CYGPATH_W) 'src/fs.c'; else $(CYGPATH_W) '$(srcdir)/src/fs.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fs.Tpo" "src/$(DEPDIR)/fs.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fs.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fs.c' object='src/fs.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fs.Po' tmpdepfile='src/$(DEPDIR)/fs.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fs.obj `if test -f 'src/fs.c'; then $(CYGPATH_W) 'src/fs.c'; else $(CYGPATH_W) '$(srcdir)/src/fs.c'; fi`
-+
-+src/fsync.o: src/fsync.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fsync.o -MD -MP -MF "src/$(DEPDIR)/fsync.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/fsync.o `test -f 'src/fsync.c' || echo '$(srcdir)/'`src/fsync.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fsync.Tpo" "src/$(DEPDIR)/fsync.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fsync.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fsync.c' object='src/fsync.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fsync.Po' tmpdepfile='src/$(DEPDIR)/fsync.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fsync.o `test -f 'src/fsync.c' || echo '$(srcdir)/'`src/fsync.c
-+
-+src/fsync.obj: src/fsync.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/fsync.obj -MD -MP -MF "src/$(DEPDIR)/fsync.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/fsync.obj `if test -f 'src/fsync.c'; then $(CYGPATH_W) 'src/fsync.c'; else $(CYGPATH_W) '$(srcdir)/src/fsync.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/fsync.Tpo" "src/$(DEPDIR)/fsync.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/fsync.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/fsync.c' object='src/fsync.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/fsync.Po' tmpdepfile='src/$(DEPDIR)/fsync.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/fsync.obj `if test -f 'src/fsync.c'; then $(CYGPATH_W) 'src/fsync.c'; else $(CYGPATH_W) '$(srcdir)/src/fsync.c'; fi`
-+
-+src/getdirentries.o: src/getdirentries.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/getdirentries.o -MD -MP -MF "src/$(DEPDIR)/getdirentries.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/getdirentries.o `test -f 'src/getdirentries.c' || echo '$(srcdir)/'`src/getdirentries.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/getdirentries.Tpo" "src/$(DEPDIR)/getdirentries.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/getdirentries.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/getdirentries.c' object='src/getdirentries.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/getdirentries.Po' tmpdepfile='src/$(DEPDIR)/getdirentries.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/getdirentries.o `test -f 'src/getdirentries.c' || echo '$(srcdir)/'`src/getdirentries.c
-+
-+src/getdirentries.obj: src/getdirentries.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/getdirentries.obj -MD -MP -MF "src/$(DEPDIR)/getdirentries.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/getdirentries.obj `if test -f 'src/getdirentries.c'; then $(CYGPATH_W) 'src/getdirentries.c'; else $(CYGPATH_W) '$(srcdir)/src/getdirentries.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/getdirentries.Tpo" "src/$(DEPDIR)/getdirentries.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/getdirentries.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/getdirentries.c' object='src/getdirentries.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/getdirentries.Po' tmpdepfile='src/$(DEPDIR)/getdirentries.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/getdirentries.obj `if test -f 'src/getdirentries.c'; then $(CYGPATH_W) 'src/getdirentries.c'; else $(CYGPATH_W) '$(srcdir)/src/getdirentries.c'; fi`
-+
-+src/init.o: src/init.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/init.o -MD -MP -MF "src/$(DEPDIR)/init.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/init.o `test -f 'src/init.c' || echo '$(srcdir)/'`src/init.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/init.Tpo" "src/$(DEPDIR)/init.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/init.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/init.c' object='src/init.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/init.Po' tmpdepfile='src/$(DEPDIR)/init.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/init.o `test -f 'src/init.c' || echo '$(srcdir)/'`src/init.c
-+
-+src/init.obj: src/init.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/init.obj -MD -MP -MF "src/$(DEPDIR)/init.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/init.obj `if test -f 'src/init.c'; then $(CYGPATH_W) 'src/init.c'; else $(CYGPATH_W) '$(srcdir)/src/init.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/init.Tpo" "src/$(DEPDIR)/init.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/init.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/init.c' object='src/init.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/init.Po' tmpdepfile='src/$(DEPDIR)/init.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/init.obj `if test -f 'src/init.c'; then $(CYGPATH_W) 'src/init.c'; else $(CYGPATH_W) '$(srcdir)/src/init.c'; fi`
-+
-+src/inode.o: src/inode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/inode.o -MD -MP -MF "src/$(DEPDIR)/inode.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/inode.o `test -f 'src/inode.c' || echo '$(srcdir)/'`src/inode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/inode.Tpo" "src/$(DEPDIR)/inode.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/inode.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/inode.c' object='src/inode.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/inode.Po' tmpdepfile='src/$(DEPDIR)/inode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/inode.o `test -f 'src/inode.c' || echo '$(srcdir)/'`src/inode.c
-+
-+src/inode.obj: src/inode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/inode.obj -MD -MP -MF "src/$(DEPDIR)/inode.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/inode.obj `if test -f 'src/inode.c'; then $(CYGPATH_W) 'src/inode.c'; else $(CYGPATH_W) '$(srcdir)/src/inode.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/inode.Tpo" "src/$(DEPDIR)/inode.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/inode.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/inode.c' object='src/inode.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/inode.Po' tmpdepfile='src/$(DEPDIR)/inode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/inode.obj `if test -f 'src/inode.c'; then $(CYGPATH_W) 'src/inode.c'; else $(CYGPATH_W) '$(srcdir)/src/inode.c'; fi`
-+
-+src/ioctl.o: src/ioctl.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ioctl.o -MD -MP -MF "src/$(DEPDIR)/ioctl.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/ioctl.o `test -f 'src/ioctl.c' || echo '$(srcdir)/'`src/ioctl.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/ioctl.Tpo" "src/$(DEPDIR)/ioctl.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/ioctl.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ioctl.c' object='src/ioctl.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/ioctl.Po' tmpdepfile='src/$(DEPDIR)/ioctl.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ioctl.o `test -f 'src/ioctl.c' || echo '$(srcdir)/'`src/ioctl.c
-+
-+src/ioctl.obj: src/ioctl.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ioctl.obj -MD -MP -MF "src/$(DEPDIR)/ioctl.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/ioctl.obj `if test -f 'src/ioctl.c'; then $(CYGPATH_W) 'src/ioctl.c'; else $(CYGPATH_W) '$(srcdir)/src/ioctl.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/ioctl.Tpo" "src/$(DEPDIR)/ioctl.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/ioctl.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ioctl.c' object='src/ioctl.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/ioctl.Po' tmpdepfile='src/$(DEPDIR)/ioctl.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ioctl.obj `if test -f 'src/ioctl.c'; then $(CYGPATH_W) 'src/ioctl.c'; else $(CYGPATH_W) '$(srcdir)/src/ioctl.c'; fi`
-+
-+src/ioctx.o: src/ioctx.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ioctx.o -MD -MP -MF "src/$(DEPDIR)/ioctx.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/ioctx.o `test -f 'src/ioctx.c' || echo '$(srcdir)/'`src/ioctx.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/ioctx.Tpo" "src/$(DEPDIR)/ioctx.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/ioctx.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ioctx.c' object='src/ioctx.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/ioctx.Po' tmpdepfile='src/$(DEPDIR)/ioctx.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ioctx.o `test -f 'src/ioctx.c' || echo '$(srcdir)/'`src/ioctx.c
-+
-+src/ioctx.obj: src/ioctx.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ioctx.obj -MD -MP -MF "src/$(DEPDIR)/ioctx.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/ioctx.obj `if test -f 'src/ioctx.c'; then $(CYGPATH_W) 'src/ioctx.c'; else $(CYGPATH_W) '$(srcdir)/src/ioctx.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/ioctx.Tpo" "src/$(DEPDIR)/ioctx.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/ioctx.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ioctx.c' object='src/ioctx.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/ioctx.Po' tmpdepfile='src/$(DEPDIR)/ioctx.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ioctx.obj `if test -f 'src/ioctx.c'; then $(CYGPATH_W) 'src/ioctx.c'; else $(CYGPATH_W) '$(srcdir)/src/ioctx.c'; fi`
-+
-+src/iowait.o: src/iowait.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/iowait.o -MD -MP -MF "src/$(DEPDIR)/iowait.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/iowait.o `test -f 'src/iowait.c' || echo '$(srcdir)/'`src/iowait.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/iowait.Tpo" "src/$(DEPDIR)/iowait.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/iowait.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/iowait.c' object='src/iowait.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/iowait.Po' tmpdepfile='src/$(DEPDIR)/iowait.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/iowait.o `test -f 'src/iowait.c' || echo '$(srcdir)/'`src/iowait.c
-+
-+src/iowait.obj: src/iowait.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/iowait.obj -MD -MP -MF "src/$(DEPDIR)/iowait.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/iowait.obj `if test -f 'src/iowait.c'; then $(CYGPATH_W) 'src/iowait.c'; else $(CYGPATH_W) '$(srcdir)/src/iowait.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/iowait.Tpo" "src/$(DEPDIR)/iowait.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/iowait.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/iowait.c' object='src/iowait.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/iowait.Po' tmpdepfile='src/$(DEPDIR)/iowait.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/iowait.obj `if test -f 'src/iowait.c'; then $(CYGPATH_W) 'src/iowait.c'; else $(CYGPATH_W) '$(srcdir)/src/iowait.c'; fi`
-+
-+src/link.o: src/link.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/link.o -MD -MP -MF "src/$(DEPDIR)/link.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/link.o `test -f 'src/link.c' || echo '$(srcdir)/'`src/link.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/link.Tpo" "src/$(DEPDIR)/link.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/link.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/link.c' object='src/link.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/link.Po' tmpdepfile='src/$(DEPDIR)/link.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/link.o `test -f 'src/link.c' || echo '$(srcdir)/'`src/link.c
-+
-+src/link.obj: src/link.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/link.obj -MD -MP -MF "src/$(DEPDIR)/link.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/link.obj `if test -f 'src/link.c'; then $(CYGPATH_W) 'src/link.c'; else $(CYGPATH_W) '$(srcdir)/src/link.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/link.Tpo" "src/$(DEPDIR)/link.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/link.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/link.c' object='src/link.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/link.Po' tmpdepfile='src/$(DEPDIR)/link.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/link.obj `if test -f 'src/link.c'; then $(CYGPATH_W) 'src/link.c'; else $(CYGPATH_W) '$(srcdir)/src/link.c'; fi`
-+
-+src/lseek.o: src/lseek.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/lseek.o -MD -MP -MF "src/$(DEPDIR)/lseek.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/lseek.o `test -f 'src/lseek.c' || echo '$(srcdir)/'`src/lseek.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/lseek.Tpo" "src/$(DEPDIR)/lseek.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/lseek.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/lseek.c' object='src/lseek.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/lseek.Po' tmpdepfile='src/$(DEPDIR)/lseek.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/lseek.o `test -f 'src/lseek.c' || echo '$(srcdir)/'`src/lseek.c
-+
-+src/lseek.obj: src/lseek.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/lseek.obj -MD -MP -MF "src/$(DEPDIR)/lseek.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/lseek.obj `if test -f 'src/lseek.c'; then $(CYGPATH_W) 'src/lseek.c'; else $(CYGPATH_W) '$(srcdir)/src/lseek.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/lseek.Tpo" "src/$(DEPDIR)/lseek.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/lseek.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/lseek.c' object='src/lseek.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/lseek.Po' tmpdepfile='src/$(DEPDIR)/lseek.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/lseek.obj `if test -f 'src/lseek.c'; then $(CYGPATH_W) 'src/lseek.c'; else $(CYGPATH_W) '$(srcdir)/src/lseek.c'; fi`
-+
-+src/mkdir.o: src/mkdir.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mkdir.o -MD -MP -MF "src/$(DEPDIR)/mkdir.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/mkdir.o `test -f 'src/mkdir.c' || echo '$(srcdir)/'`src/mkdir.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mkdir.Tpo" "src/$(DEPDIR)/mkdir.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mkdir.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mkdir.c' object='src/mkdir.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mkdir.Po' tmpdepfile='src/$(DEPDIR)/mkdir.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mkdir.o `test -f 'src/mkdir.c' || echo '$(srcdir)/'`src/mkdir.c
-+
-+src/mkdir.obj: src/mkdir.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mkdir.obj -MD -MP -MF "src/$(DEPDIR)/mkdir.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/mkdir.obj `if test -f 'src/mkdir.c'; then $(CYGPATH_W) 'src/mkdir.c'; else $(CYGPATH_W) '$(srcdir)/src/mkdir.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mkdir.Tpo" "src/$(DEPDIR)/mkdir.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mkdir.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mkdir.c' object='src/mkdir.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mkdir.Po' tmpdepfile='src/$(DEPDIR)/mkdir.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mkdir.obj `if test -f 'src/mkdir.c'; then $(CYGPATH_W) 'src/mkdir.c'; else $(CYGPATH_W) '$(srcdir)/src/mkdir.c'; fi`
-+
-+src/mknod.o: src/mknod.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mknod.o -MD -MP -MF "src/$(DEPDIR)/mknod.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/mknod.o `test -f 'src/mknod.c' || echo '$(srcdir)/'`src/mknod.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mknod.Tpo" "src/$(DEPDIR)/mknod.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mknod.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mknod.c' object='src/mknod.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mknod.Po' tmpdepfile='src/$(DEPDIR)/mknod.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mknod.o `test -f 'src/mknod.c' || echo '$(srcdir)/'`src/mknod.c
-+
-+src/mknod.obj: src/mknod.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mknod.obj -MD -MP -MF "src/$(DEPDIR)/mknod.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/mknod.obj `if test -f 'src/mknod.c'; then $(CYGPATH_W) 'src/mknod.c'; else $(CYGPATH_W) '$(srcdir)/src/mknod.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mknod.Tpo" "src/$(DEPDIR)/mknod.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mknod.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mknod.c' object='src/mknod.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mknod.Po' tmpdepfile='src/$(DEPDIR)/mknod.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mknod.obj `if test -f 'src/mknod.c'; then $(CYGPATH_W) 'src/mknod.c'; else $(CYGPATH_W) '$(srcdir)/src/mknod.c'; fi`
-+
-+src/mount.o: src/mount.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mount.o -MD -MP -MF "src/$(DEPDIR)/mount.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/mount.o `test -f 'src/mount.c' || echo '$(srcdir)/'`src/mount.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mount.Tpo" "src/$(DEPDIR)/mount.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mount.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mount.c' object='src/mount.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mount.Po' tmpdepfile='src/$(DEPDIR)/mount.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mount.o `test -f 'src/mount.c' || echo '$(srcdir)/'`src/mount.c
-+
-+src/mount.obj: src/mount.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/mount.obj -MD -MP -MF "src/$(DEPDIR)/mount.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/mount.obj `if test -f 'src/mount.c'; then $(CYGPATH_W) 'src/mount.c'; else $(CYGPATH_W) '$(srcdir)/src/mount.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/mount.Tpo" "src/$(DEPDIR)/mount.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/mount.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mount.c' object='src/mount.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/mount.Po' tmpdepfile='src/$(DEPDIR)/mount.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mount.obj `if test -f 'src/mount.c'; then $(CYGPATH_W) 'src/mount.c'; else $(CYGPATH_W) '$(srcdir)/src/mount.c'; fi`
-+
-+src/namei.o: src/namei.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/namei.o -MD -MP -MF "src/$(DEPDIR)/namei.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/namei.o `test -f 'src/namei.c' || echo '$(srcdir)/'`src/namei.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/namei.Tpo" "src/$(DEPDIR)/namei.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/namei.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/namei.c' object='src/namei.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/namei.Po' tmpdepfile='src/$(DEPDIR)/namei.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/namei.o `test -f 'src/namei.c' || echo '$(srcdir)/'`src/namei.c
-+
-+src/namei.obj: src/namei.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/namei.obj -MD -MP -MF "src/$(DEPDIR)/namei.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/namei.obj `if test -f 'src/namei.c'; then $(CYGPATH_W) 'src/namei.c'; else $(CYGPATH_W) '$(srcdir)/src/namei.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/namei.Tpo" "src/$(DEPDIR)/namei.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/namei.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/namei.c' object='src/namei.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/namei.Po' tmpdepfile='src/$(DEPDIR)/namei.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/namei.obj `if test -f 'src/namei.c'; then $(CYGPATH_W) 'src/namei.c'; else $(CYGPATH_W) '$(srcdir)/src/namei.c'; fi`
-+
-+src/open.o: src/open.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/open.o -MD -MP -MF "src/$(DEPDIR)/open.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/open.o `test -f 'src/open.c' || echo '$(srcdir)/'`src/open.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/open.Tpo" "src/$(DEPDIR)/open.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/open.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/open.c' object='src/open.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/open.Po' tmpdepfile='src/$(DEPDIR)/open.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/open.o `test -f 'src/open.c' || echo '$(srcdir)/'`src/open.c
-+
-+src/open.obj: src/open.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/open.obj -MD -MP -MF "src/$(DEPDIR)/open.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/open.obj `if test -f 'src/open.c'; then $(CYGPATH_W) 'src/open.c'; else $(CYGPATH_W) '$(srcdir)/src/open.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/open.Tpo" "src/$(DEPDIR)/open.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/open.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/open.c' object='src/open.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/open.Po' tmpdepfile='src/$(DEPDIR)/open.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/open.obj `if test -f 'src/open.c'; then $(CYGPATH_W) 'src/open.c'; else $(CYGPATH_W) '$(srcdir)/src/open.c'; fi`
-+
-+src/rw.o: src/rw.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rw.o -MD -MP -MF "src/$(DEPDIR)/rw.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/rw.o `test -f 'src/rw.c' || echo '$(srcdir)/'`src/rw.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rw.Tpo" "src/$(DEPDIR)/rw.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rw.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rw.c' object='src/rw.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rw.Po' tmpdepfile='src/$(DEPDIR)/rw.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rw.o `test -f 'src/rw.c' || echo '$(srcdir)/'`src/rw.c
-+
-+src/rw.obj: src/rw.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rw.obj -MD -MP -MF "src/$(DEPDIR)/rw.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/rw.obj `if test -f 'src/rw.c'; then $(CYGPATH_W) 'src/rw.c'; else $(CYGPATH_W) '$(srcdir)/src/rw.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rw.Tpo" "src/$(DEPDIR)/rw.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rw.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rw.c' object='src/rw.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rw.Po' tmpdepfile='src/$(DEPDIR)/rw.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rw.obj `if test -f 'src/rw.c'; then $(CYGPATH_W) 'src/rw.c'; else $(CYGPATH_W) '$(srcdir)/src/rw.c'; fi`
-+
-+src/reconcile.o: src/reconcile.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/reconcile.o -MD -MP -MF "src/$(DEPDIR)/reconcile.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/reconcile.o `test -f 'src/reconcile.c' || echo '$(srcdir)/'`src/reconcile.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/reconcile.Tpo" "src/$(DEPDIR)/reconcile.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/reconcile.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/reconcile.c' object='src/reconcile.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/reconcile.Po' tmpdepfile='src/$(DEPDIR)/reconcile.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/reconcile.o `test -f 'src/reconcile.c' || echo '$(srcdir)/'`src/reconcile.c
-+
-+src/reconcile.obj: src/reconcile.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/reconcile.obj -MD -MP -MF "src/$(DEPDIR)/reconcile.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/reconcile.obj `if test -f 'src/reconcile.c'; then $(CYGPATH_W) 'src/reconcile.c'; else $(CYGPATH_W) '$(srcdir)/src/reconcile.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/reconcile.Tpo" "src/$(DEPDIR)/reconcile.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/reconcile.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/reconcile.c' object='src/reconcile.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/reconcile.Po' tmpdepfile='src/$(DEPDIR)/reconcile.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/reconcile.obj `if test -f 'src/reconcile.c'; then $(CYGPATH_W) 'src/reconcile.c'; else $(CYGPATH_W) '$(srcdir)/src/reconcile.c'; fi`
-+
-+src/rename.o: src/rename.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rename.o -MD -MP -MF "src/$(DEPDIR)/rename.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/rename.o `test -f 'src/rename.c' || echo '$(srcdir)/'`src/rename.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rename.Tpo" "src/$(DEPDIR)/rename.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rename.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rename.c' object='src/rename.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rename.Po' tmpdepfile='src/$(DEPDIR)/rename.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rename.o `test -f 'src/rename.c' || echo '$(srcdir)/'`src/rename.c
-+
-+src/rename.obj: src/rename.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rename.obj -MD -MP -MF "src/$(DEPDIR)/rename.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/rename.obj `if test -f 'src/rename.c'; then $(CYGPATH_W) 'src/rename.c'; else $(CYGPATH_W) '$(srcdir)/src/rename.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rename.Tpo" "src/$(DEPDIR)/rename.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rename.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rename.c' object='src/rename.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rename.Po' tmpdepfile='src/$(DEPDIR)/rename.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rename.obj `if test -f 'src/rename.c'; then $(CYGPATH_W) 'src/rename.c'; else $(CYGPATH_W) '$(srcdir)/src/rename.c'; fi`
-+
-+src/rmdir.o: src/rmdir.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rmdir.o -MD -MP -MF "src/$(DEPDIR)/rmdir.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/rmdir.o `test -f 'src/rmdir.c' || echo '$(srcdir)/'`src/rmdir.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rmdir.Tpo" "src/$(DEPDIR)/rmdir.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rmdir.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rmdir.c' object='src/rmdir.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rmdir.Po' tmpdepfile='src/$(DEPDIR)/rmdir.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rmdir.o `test -f 'src/rmdir.c' || echo '$(srcdir)/'`src/rmdir.c
-+
-+src/rmdir.obj: src/rmdir.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/rmdir.obj -MD -MP -MF "src/$(DEPDIR)/rmdir.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/rmdir.obj `if test -f 'src/rmdir.c'; then $(CYGPATH_W) 'src/rmdir.c'; else $(CYGPATH_W) '$(srcdir)/src/rmdir.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/rmdir.Tpo" "src/$(DEPDIR)/rmdir.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/rmdir.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rmdir.c' object='src/rmdir.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/rmdir.Po' tmpdepfile='src/$(DEPDIR)/rmdir.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/rmdir.obj `if test -f 'src/rmdir.c'; then $(CYGPATH_W) 'src/rmdir.c'; else $(CYGPATH_W) '$(srcdir)/src/rmdir.c'; fi`
-+
-+src/stat64.o: src/stat64.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stat64.o -MD -MP -MF "src/$(DEPDIR)/stat64.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/stat64.o `test -f 'src/stat64.c' || echo '$(srcdir)/'`src/stat64.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stat64.Tpo" "src/$(DEPDIR)/stat64.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stat64.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stat64.c' object='src/stat64.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stat64.Po' tmpdepfile='src/$(DEPDIR)/stat64.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stat64.o `test -f 'src/stat64.c' || echo '$(srcdir)/'`src/stat64.c
-+
-+src/stat64.obj: src/stat64.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stat64.obj -MD -MP -MF "src/$(DEPDIR)/stat64.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/stat64.obj `if test -f 'src/stat64.c'; then $(CYGPATH_W) 'src/stat64.c'; else $(CYGPATH_W) '$(srcdir)/src/stat64.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stat64.Tpo" "src/$(DEPDIR)/stat64.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stat64.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stat64.c' object='src/stat64.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stat64.Po' tmpdepfile='src/$(DEPDIR)/stat64.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stat64.obj `if test -f 'src/stat64.c'; then $(CYGPATH_W) 'src/stat64.c'; else $(CYGPATH_W) '$(srcdir)/src/stat64.c'; fi`
-+
-+src/stat.o: src/stat.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stat.o -MD -MP -MF "src/$(DEPDIR)/stat.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/stat.o `test -f 'src/stat.c' || echo '$(srcdir)/'`src/stat.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stat.Tpo" "src/$(DEPDIR)/stat.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stat.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stat.c' object='src/stat.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stat.Po' tmpdepfile='src/$(DEPDIR)/stat.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stat.o `test -f 'src/stat.c' || echo '$(srcdir)/'`src/stat.c
-+
-+src/stat.obj: src/stat.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stat.obj -MD -MP -MF "src/$(DEPDIR)/stat.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/stat.obj `if test -f 'src/stat.c'; then $(CYGPATH_W) 'src/stat.c'; else $(CYGPATH_W) '$(srcdir)/src/stat.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stat.Tpo" "src/$(DEPDIR)/stat.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stat.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stat.c' object='src/stat.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stat.Po' tmpdepfile='src/$(DEPDIR)/stat.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stat.obj `if test -f 'src/stat.c'; then $(CYGPATH_W) 'src/stat.c'; else $(CYGPATH_W) '$(srcdir)/src/stat.c'; fi`
-+
-+src/stddir.o: src/stddir.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stddir.o -MD -MP -MF "src/$(DEPDIR)/stddir.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/stddir.o `test -f 'src/stddir.c' || echo '$(srcdir)/'`src/stddir.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stddir.Tpo" "src/$(DEPDIR)/stddir.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stddir.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stddir.c' object='src/stddir.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stddir.Po' tmpdepfile='src/$(DEPDIR)/stddir.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stddir.o `test -f 'src/stddir.c' || echo '$(srcdir)/'`src/stddir.c
-+
-+src/stddir.obj: src/stddir.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stddir.obj -MD -MP -MF "src/$(DEPDIR)/stddir.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/stddir.obj `if test -f 'src/stddir.c'; then $(CYGPATH_W) 'src/stddir.c'; else $(CYGPATH_W) '$(srcdir)/src/stddir.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stddir.Tpo" "src/$(DEPDIR)/stddir.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stddir.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stddir.c' object='src/stddir.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stddir.Po' tmpdepfile='src/$(DEPDIR)/stddir.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stddir.obj `if test -f 'src/stddir.c'; then $(CYGPATH_W) 'src/stddir.c'; else $(CYGPATH_W) '$(srcdir)/src/stddir.c'; fi`
-+
-+src/readdir.o: src/readdir.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readdir.o -MD -MP -MF "src/$(DEPDIR)/readdir.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/readdir.o `test -f 'src/readdir.c' || echo '$(srcdir)/'`src/readdir.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readdir.Tpo" "src/$(DEPDIR)/readdir.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readdir.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readdir.c' object='src/readdir.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readdir.Po' tmpdepfile='src/$(DEPDIR)/readdir.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readdir.o `test -f 'src/readdir.c' || echo '$(srcdir)/'`src/readdir.c
-+
-+src/readdir.obj: src/readdir.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readdir.obj -MD -MP -MF "src/$(DEPDIR)/readdir.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/readdir.obj `if test -f 'src/readdir.c'; then $(CYGPATH_W) 'src/readdir.c'; else $(CYGPATH_W) '$(srcdir)/src/readdir.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readdir.Tpo" "src/$(DEPDIR)/readdir.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readdir.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readdir.c' object='src/readdir.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readdir.Po' tmpdepfile='src/$(DEPDIR)/readdir.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readdir.obj `if test -f 'src/readdir.c'; then $(CYGPATH_W) 'src/readdir.c'; else $(CYGPATH_W) '$(srcdir)/src/readdir.c'; fi`
-+
-+src/readdir64.o: src/readdir64.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readdir64.o -MD -MP -MF "src/$(DEPDIR)/readdir64.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/readdir64.o `test -f 'src/readdir64.c' || echo '$(srcdir)/'`src/readdir64.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readdir64.Tpo" "src/$(DEPDIR)/readdir64.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readdir64.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readdir64.c' object='src/readdir64.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readdir64.Po' tmpdepfile='src/$(DEPDIR)/readdir64.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readdir64.o `test -f 'src/readdir64.c' || echo '$(srcdir)/'`src/readdir64.c
-+
-+src/readdir64.obj: src/readdir64.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readdir64.obj -MD -MP -MF "src/$(DEPDIR)/readdir64.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/readdir64.obj `if test -f 'src/readdir64.c'; then $(CYGPATH_W) 'src/readdir64.c'; else $(CYGPATH_W) '$(srcdir)/src/readdir64.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readdir64.Tpo" "src/$(DEPDIR)/readdir64.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readdir64.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readdir64.c' object='src/readdir64.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readdir64.Po' tmpdepfile='src/$(DEPDIR)/readdir64.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readdir64.obj `if test -f 'src/readdir64.c'; then $(CYGPATH_W) 'src/readdir64.c'; else $(CYGPATH_W) '$(srcdir)/src/readdir64.c'; fi`
-+
-+src/symlink.o: src/symlink.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/symlink.o -MD -MP -MF "src/$(DEPDIR)/symlink.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/symlink.o `test -f 'src/symlink.c' || echo '$(srcdir)/'`src/symlink.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/symlink.Tpo" "src/$(DEPDIR)/symlink.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/symlink.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/symlink.c' object='src/symlink.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/symlink.Po' tmpdepfile='src/$(DEPDIR)/symlink.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/symlink.o `test -f 'src/symlink.c' || echo '$(srcdir)/'`src/symlink.c
-+
-+src/symlink.obj: src/symlink.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/symlink.obj -MD -MP -MF "src/$(DEPDIR)/symlink.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/symlink.obj `if test -f 'src/symlink.c'; then $(CYGPATH_W) 'src/symlink.c'; else $(CYGPATH_W) '$(srcdir)/src/symlink.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/symlink.Tpo" "src/$(DEPDIR)/symlink.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/symlink.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/symlink.c' object='src/symlink.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/symlink.Po' tmpdepfile='src/$(DEPDIR)/symlink.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/symlink.obj `if test -f 'src/symlink.c'; then $(CYGPATH_W) 'src/symlink.c'; else $(CYGPATH_W) '$(srcdir)/src/symlink.c'; fi`
-+
-+src/readlink.o: src/readlink.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readlink.o -MD -MP -MF "src/$(DEPDIR)/readlink.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/readlink.o `test -f 'src/readlink.c' || echo '$(srcdir)/'`src/readlink.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readlink.Tpo" "src/$(DEPDIR)/readlink.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readlink.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readlink.c' object='src/readlink.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readlink.Po' tmpdepfile='src/$(DEPDIR)/readlink.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readlink.o `test -f 'src/readlink.c' || echo '$(srcdir)/'`src/readlink.c
-+
-+src/readlink.obj: src/readlink.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/readlink.obj -MD -MP -MF "src/$(DEPDIR)/readlink.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/readlink.obj `if test -f 'src/readlink.c'; then $(CYGPATH_W) 'src/readlink.c'; else $(CYGPATH_W) '$(srcdir)/src/readlink.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/readlink.Tpo" "src/$(DEPDIR)/readlink.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/readlink.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/readlink.c' object='src/readlink.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/readlink.Po' tmpdepfile='src/$(DEPDIR)/readlink.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/readlink.obj `if test -f 'src/readlink.c'; then $(CYGPATH_W) 'src/readlink.c'; else $(CYGPATH_W) '$(srcdir)/src/readlink.c'; fi`
-+
-+src/truncate.o: src/truncate.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/truncate.o -MD -MP -MF "src/$(DEPDIR)/truncate.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/truncate.o `test -f 'src/truncate.c' || echo '$(srcdir)/'`src/truncate.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/truncate.Tpo" "src/$(DEPDIR)/truncate.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/truncate.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/truncate.c' object='src/truncate.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/truncate.Po' tmpdepfile='src/$(DEPDIR)/truncate.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/truncate.o `test -f 'src/truncate.c' || echo '$(srcdir)/'`src/truncate.c
-+
-+src/truncate.obj: src/truncate.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/truncate.obj -MD -MP -MF "src/$(DEPDIR)/truncate.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/truncate.obj `if test -f 'src/truncate.c'; then $(CYGPATH_W) 'src/truncate.c'; else $(CYGPATH_W) '$(srcdir)/src/truncate.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/truncate.Tpo" "src/$(DEPDIR)/truncate.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/truncate.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/truncate.c' object='src/truncate.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/truncate.Po' tmpdepfile='src/$(DEPDIR)/truncate.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/truncate.obj `if test -f 'src/truncate.c'; then $(CYGPATH_W) 'src/truncate.c'; else $(CYGPATH_W) '$(srcdir)/src/truncate.c'; fi`
-+
-+src/unlink.o: src/unlink.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/unlink.o -MD -MP -MF "src/$(DEPDIR)/unlink.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/unlink.o `test -f 'src/unlink.c' || echo '$(srcdir)/'`src/unlink.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/unlink.Tpo" "src/$(DEPDIR)/unlink.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/unlink.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/unlink.c' object='src/unlink.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/unlink.Po' tmpdepfile='src/$(DEPDIR)/unlink.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/unlink.o `test -f 'src/unlink.c' || echo '$(srcdir)/'`src/unlink.c
-+
-+src/unlink.obj: src/unlink.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/unlink.obj -MD -MP -MF "src/$(DEPDIR)/unlink.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/unlink.obj `if test -f 'src/unlink.c'; then $(CYGPATH_W) 'src/unlink.c'; else $(CYGPATH_W) '$(srcdir)/src/unlink.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/unlink.Tpo" "src/$(DEPDIR)/unlink.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/unlink.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/unlink.c' object='src/unlink.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/unlink.Po' tmpdepfile='src/$(DEPDIR)/unlink.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/unlink.obj `if test -f 'src/unlink.c'; then $(CYGPATH_W) 'src/unlink.c'; else $(CYGPATH_W) '$(srcdir)/src/unlink.c'; fi`
-+
-+src/utime.o: src/utime.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/utime.o -MD -MP -MF "src/$(DEPDIR)/utime.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/utime.o `test -f 'src/utime.c' || echo '$(srcdir)/'`src/utime.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/utime.Tpo" "src/$(DEPDIR)/utime.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/utime.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utime.c' object='src/utime.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/utime.Po' tmpdepfile='src/$(DEPDIR)/utime.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/utime.o `test -f 'src/utime.c' || echo '$(srcdir)/'`src/utime.c
-+
-+src/utime.obj: src/utime.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/utime.obj -MD -MP -MF "src/$(DEPDIR)/utime.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/utime.obj `if test -f 'src/utime.c'; then $(CYGPATH_W) 'src/utime.c'; else $(CYGPATH_W) '$(srcdir)/src/utime.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/utime.Tpo" "src/$(DEPDIR)/utime.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/utime.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utime.c' object='src/utime.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/utime.Po' tmpdepfile='src/$(DEPDIR)/utime.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/utime.obj `if test -f 'src/utime.c'; then $(CYGPATH_W) 'src/utime.c'; else $(CYGPATH_W) '$(srcdir)/src/utime.c'; fi`
-+
-+src/file_hack.o: src/file_hack.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file_hack.o -MD -MP -MF "src/$(DEPDIR)/file_hack.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/file_hack.o `test -f 'src/file_hack.c' || echo '$(srcdir)/'`src/file_hack.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/file_hack.Tpo" "src/$(DEPDIR)/file_hack.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/file_hack.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/file_hack.c' object='src/file_hack.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/file_hack.Po' tmpdepfile='src/$(DEPDIR)/file_hack.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file_hack.o `test -f 'src/file_hack.c' || echo '$(srcdir)/'`src/file_hack.c
-+
-+src/file_hack.obj: src/file_hack.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file_hack.obj -MD -MP -MF "src/$(DEPDIR)/file_hack.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/file_hack.obj `if test -f 'src/file_hack.c'; then $(CYGPATH_W) 'src/file_hack.c'; else $(CYGPATH_W) '$(srcdir)/src/file_hack.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/file_hack.Tpo" "src/$(DEPDIR)/file_hack.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/file_hack.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/file_hack.c' object='src/file_hack.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/file_hack.Po' tmpdepfile='src/$(DEPDIR)/file_hack.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file_hack.obj `if test -f 'src/file_hack.c'; then $(CYGPATH_W) 'src/file_hack.c'; else $(CYGPATH_W) '$(srcdir)/src/file_hack.c'; fi`
-+
-+src/file.o: src/file.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file.o -MD -MP -MF "src/$(DEPDIR)/file.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/file.o `test -f 'src/file.c' || echo '$(srcdir)/'`src/file.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/file.Tpo" "src/$(DEPDIR)/file.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/file.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/file.c' object='src/file.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/file.Po' tmpdepfile='src/$(DEPDIR)/file.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file.o `test -f 'src/file.c' || echo '$(srcdir)/'`src/file.c
-+
-+src/file.obj: src/file.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file.obj -MD -MP -MF "src/$(DEPDIR)/file.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/file.obj `if test -f 'src/file.c'; then $(CYGPATH_W) 'src/file.c'; else $(CYGPATH_W) '$(srcdir)/src/file.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/file.Tpo" "src/$(DEPDIR)/file.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/file.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/file.c' object='src/file.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/file.Po' tmpdepfile='src/$(DEPDIR)/file.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file.obj `if test -f 'src/file.c'; then $(CYGPATH_W) 'src/file.c'; else $(CYGPATH_W) '$(srcdir)/src/file.c'; fi`
-+
-+src/stdlib.o: src/stdlib.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stdlib.o -MD -MP -MF "src/$(DEPDIR)/stdlib.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/stdlib.o `test -f 'src/stdlib.c' || echo '$(srcdir)/'`src/stdlib.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stdlib.Tpo" "src/$(DEPDIR)/stdlib.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stdlib.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stdlib.c' object='src/stdlib.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stdlib.Po' tmpdepfile='src/$(DEPDIR)/stdlib.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stdlib.o `test -f 'src/stdlib.c' || echo '$(srcdir)/'`src/stdlib.c
-+
-+src/stdlib.obj: src/stdlib.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/stdlib.obj -MD -MP -MF "src/$(DEPDIR)/stdlib.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o src/stdlib.obj `if test -f 'src/stdlib.c'; then $(CYGPATH_W) 'src/stdlib.c'; else $(CYGPATH_W) '$(srcdir)/src/stdlib.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "src/$(DEPDIR)/stdlib.Tpo" "src/$(DEPDIR)/stdlib.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "src/$(DEPDIR)/stdlib.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/stdlib.c' object='src/stdlib.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='src/$(DEPDIR)/stdlib.Po' tmpdepfile='src/$(DEPDIR)/stdlib.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/stdlib.obj `if test -f 'src/stdlib.c'; then $(CYGPATH_W) 'src/stdlib.c'; else $(CYGPATH_W) '$(srcdir)/src/stdlib.c'; fi`
-+
-+dev/stdfd/stdfd.o: dev/stdfd/stdfd.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dev/stdfd/stdfd.o -MD -MP -MF "dev/stdfd/$(DEPDIR)/stdfd.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o dev/stdfd/stdfd.o `test -f 'dev/stdfd/stdfd.c' || echo '$(srcdir)/'`dev/stdfd/stdfd.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "dev/stdfd/$(DEPDIR)/stdfd.Tpo" "dev/stdfd/$(DEPDIR)/stdfd.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "dev/stdfd/$(DEPDIR)/stdfd.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dev/stdfd/stdfd.c' object='dev/stdfd/stdfd.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='dev/stdfd/$(DEPDIR)/stdfd.Po' tmpdepfile='dev/stdfd/$(DEPDIR)/stdfd.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dev/stdfd/stdfd.o `test -f 'dev/stdfd/stdfd.c' || echo '$(srcdir)/'`dev/stdfd/stdfd.c
-+
-+dev/stdfd/stdfd.obj: dev/stdfd/stdfd.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dev/stdfd/stdfd.obj -MD -MP -MF "dev/stdfd/$(DEPDIR)/stdfd.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o dev/stdfd/stdfd.obj `if test -f 'dev/stdfd/stdfd.c'; then $(CYGPATH_W) 'dev/stdfd/stdfd.c'; else $(CYGPATH_W) '$(srcdir)/dev/stdfd/stdfd.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "dev/stdfd/$(DEPDIR)/stdfd.Tpo" "dev/stdfd/$(DEPDIR)/stdfd.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "dev/stdfd/$(DEPDIR)/stdfd.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dev/stdfd/stdfd.c' object='dev/stdfd/stdfd.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='dev/stdfd/$(DEPDIR)/stdfd.Po' tmpdepfile='dev/stdfd/$(DEPDIR)/stdfd.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dev/stdfd/stdfd.obj `if test -f 'dev/stdfd/stdfd.c'; then $(CYGPATH_W) 'dev/stdfd/stdfd.c'; else $(CYGPATH_W) '$(srcdir)/dev/stdfd/stdfd.c'; fi`
-+
-+drivers/incore/fs_incore.o: drivers/incore/fs_incore.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/incore/fs_incore.o -MD -MP -MF "drivers/incore/$(DEPDIR)/fs_incore.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o drivers/incore/fs_incore.o `test -f 'drivers/incore/fs_incore.c' || echo '$(srcdir)/'`drivers/incore/fs_incore.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "drivers/incore/$(DEPDIR)/fs_incore.Tpo" "drivers/incore/$(DEPDIR)/fs_incore.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "drivers/incore/$(DEPDIR)/fs_incore.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/incore/fs_incore.c' object='drivers/incore/fs_incore.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/incore/$(DEPDIR)/fs_incore.Po' tmpdepfile='drivers/incore/$(DEPDIR)/fs_incore.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/incore/fs_incore.o `test -f 'drivers/incore/fs_incore.c' || echo '$(srcdir)/'`drivers/incore/fs_incore.c
-+
-+drivers/incore/fs_incore.obj: drivers/incore/fs_incore.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/incore/fs_incore.obj -MD -MP -MF "drivers/incore/$(DEPDIR)/fs_incore.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o drivers/incore/fs_incore.obj `if test -f 'drivers/incore/fs_incore.c'; then $(CYGPATH_W) 'drivers/incore/fs_incore.c'; else $(CYGPATH_W) '$(srcdir)/drivers/incore/fs_incore.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "drivers/incore/$(DEPDIR)/fs_incore.Tpo" "drivers/incore/$(DEPDIR)/fs_incore.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "drivers/incore/$(DEPDIR)/fs_incore.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/incore/fs_incore.c' object='drivers/incore/fs_incore.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/incore/$(DEPDIR)/fs_incore.Po' tmpdepfile='drivers/incore/$(DEPDIR)/fs_incore.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/incore/fs_incore.obj `if test -f 'drivers/incore/fs_incore.c'; then $(CYGPATH_W) 'drivers/incore/fs_incore.c'; else $(CYGPATH_W) '$(srcdir)/drivers/incore/fs_incore.c'; fi`
-+
-+drivers/sockets/sockets.o: drivers/sockets/sockets.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/sockets/sockets.o -MD -MP -MF "drivers/sockets/$(DEPDIR)/sockets.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o drivers/sockets/sockets.o `test -f 'drivers/sockets/sockets.c' || echo '$(srcdir)/'`drivers/sockets/sockets.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "drivers/sockets/$(DEPDIR)/sockets.Tpo" "drivers/sockets/$(DEPDIR)/sockets.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "drivers/sockets/$(DEPDIR)/sockets.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/sockets/sockets.c' object='drivers/sockets/sockets.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/sockets/$(DEPDIR)/sockets.Po' tmpdepfile='drivers/sockets/$(DEPDIR)/sockets.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/sockets/sockets.o `test -f 'drivers/sockets/sockets.c' || echo '$(srcdir)/'`drivers/sockets/sockets.c
-+
-+drivers/sockets/sockets.obj: drivers/sockets/sockets.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/sockets/sockets.obj -MD -MP -MF "drivers/sockets/$(DEPDIR)/sockets.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o drivers/sockets/sockets.obj `if test -f 'drivers/sockets/sockets.c'; then $(CYGPATH_W) 'drivers/sockets/sockets.c'; else $(CYGPATH_W) '$(srcdir)/drivers/sockets/sockets.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "drivers/sockets/$(DEPDIR)/sockets.Tpo" "drivers/sockets/$(DEPDIR)/sockets.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "drivers/sockets/$(DEPDIR)/sockets.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/sockets/sockets.c' object='drivers/sockets/sockets.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/sockets/$(DEPDIR)/sockets.Po' tmpdepfile='drivers/sockets/$(DEPDIR)/sockets.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/sockets/sockets.obj `if test -f 'drivers/sockets/sockets.c'; then $(CYGPATH_W) 'drivers/sockets/sockets.c'; else $(CYGPATH_W) '$(srcdir)/drivers/sockets/sockets.c'; fi`
-+
-+drivers/native/fs_native.o: drivers/native/fs_native.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/native/fs_native.o -MD -MP -MF "drivers/native/$(DEPDIR)/fs_native.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o drivers/native/fs_native.o `test -f 'drivers/native/fs_native.c' || echo '$(srcdir)/'`drivers/native/fs_native.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "drivers/native/$(DEPDIR)/fs_native.Tpo" "drivers/native/$(DEPDIR)/fs_native.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "drivers/native/$(DEPDIR)/fs_native.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/native/fs_native.c' object='drivers/native/fs_native.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/native/$(DEPDIR)/fs_native.Po' tmpdepfile='drivers/native/$(DEPDIR)/fs_native.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/native/fs_native.o `test -f 'drivers/native/fs_native.c' || echo '$(srcdir)/'`drivers/native/fs_native.c
-+
-+drivers/native/fs_native.obj: drivers/native/fs_native.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/native/fs_native.obj -MD -MP -MF "drivers/native/$(DEPDIR)/fs_native.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o drivers/native/fs_native.obj `if test -f 'drivers/native/fs_native.c'; then $(CYGPATH_W) 'drivers/native/fs_native.c'; else $(CYGPATH_W) '$(srcdir)/drivers/native/fs_native.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "drivers/native/$(DEPDIR)/fs_native.Tpo" "drivers/native/$(DEPDIR)/fs_native.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "drivers/native/$(DEPDIR)/fs_native.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/native/fs_native.c' object='drivers/native/fs_native.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/native/$(DEPDIR)/fs_native.Po' tmpdepfile='drivers/native/$(DEPDIR)/fs_native.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/native/fs_native.obj `if test -f 'drivers/native/fs_native.c'; then $(CYGPATH_W) 'drivers/native/fs_native.c'; else $(CYGPATH_W) '$(srcdir)/drivers/native/fs_native.c'; fi`
-+
-+drivers/yod/fs_yod.o: drivers/yod/fs_yod.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/yod/fs_yod.o -MD -MP -MF "drivers/yod/$(DEPDIR)/fs_yod.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o drivers/yod/fs_yod.o `test -f 'drivers/yod/fs_yod.c' || echo '$(srcdir)/'`drivers/yod/fs_yod.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "drivers/yod/$(DEPDIR)/fs_yod.Tpo" "drivers/yod/$(DEPDIR)/fs_yod.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "drivers/yod/$(DEPDIR)/fs_yod.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/yod/fs_yod.c' object='drivers/yod/fs_yod.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/yod/$(DEPDIR)/fs_yod.Po' tmpdepfile='drivers/yod/$(DEPDIR)/fs_yod.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/yod/fs_yod.o `test -f 'drivers/yod/fs_yod.c' || echo '$(srcdir)/'`drivers/yod/fs_yod.c
-+
-+drivers/yod/fs_yod.obj: drivers/yod/fs_yod.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drivers/yod/fs_yod.obj -MD -MP -MF "drivers/yod/$(DEPDIR)/fs_yod.Tpo" \
-+ at am__fastdepCC_TRUE@	  -c -o drivers/yod/fs_yod.obj `if test -f 'drivers/yod/fs_yod.c'; then $(CYGPATH_W) 'drivers/yod/fs_yod.c'; else $(CYGPATH_W) '$(srcdir)/drivers/yod/fs_yod.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "drivers/yod/$(DEPDIR)/fs_yod.Tpo" "drivers/yod/$(DEPDIR)/fs_yod.Po"; \
-+ at am__fastdepCC_TRUE@	else rm -f "drivers/yod/$(DEPDIR)/fs_yod.Tpo"; exit 1; \
-+ at am__fastdepCC_TRUE@	fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/yod/fs_yod.c' object='drivers/yod/fs_yod.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='drivers/yod/$(DEPDIR)/fs_yod.Po' tmpdepfile='drivers/yod/$(DEPDIR)/fs_yod.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drivers/yod/fs_yod.obj `if test -f 'drivers/yod/fs_yod.c'; then $(CYGPATH_W) 'drivers/yod/fs_yod.c'; else $(CYGPATH_W) '$(srcdir)/drivers/yod/fs_yod.c'; fi`
- uninstall-info-am:
- 
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+CTAGS = ctags
-+CTAGSFLAGS =
-+
-+tags: TAGS
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -628,7 +1616,6 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
--tags: TAGS
- 
- TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -640,11 +1627,10 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
--	  test -n "$$unique" || unique=$$empty_fix; \
--	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	    $$tags $$unique; \
--	fi
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
-+
- ctags: CTAGS
- CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -667,11 +1653,24 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = .
-+distdir = $(PACKAGE)-$(VERSION)
-+
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
- 
- distdir: $(DISTFILES)
- 	$(am__remove_distdir)
- 	mkdir $(distdir)
--	$(mkdir_p) $(distdir)/dev/stdfd $(distdir)/drivers/incore $(distdir)/drivers/native $(distdir)/drivers/sockets $(distdir)/drivers/yod $(distdir)/include $(distdir)/misc $(distdir)/src $(distdir)/tests
-+	$(mkinstalldirs) $(distdir)/./dev/stdfd $(distdir)/./drivers/incore $(distdir)/./drivers/native $(distdir)/./drivers/sockets $(distdir)/./drivers/yod $(distdir)/./include $(distdir)/./src $(distdir)/./tests $(distdir)/dev/stdfd $(distdir)/drivers/incore $(distdir)/drivers/native $(distdir)/drivers/sockets $(distdir)/drivers/yod $(distdir)/include $(distdir)/misc $(distdir)/src $(distdir)/tests
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
-@@ -683,7 +1682,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -704,46 +1703,19 @@
- 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- 	|| chmod -R a+r $(distdir)
- dist-gzip: distdir
--	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
--	$(am__remove_distdir)
--
--dist-bzip2: distdir
--	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
--	$(am__remove_distdir)
--
--dist-tarZ: distdir
--	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
--	$(am__remove_distdir)
--
--dist-shar: distdir
--	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
--	$(am__remove_distdir)
--
--dist-zip: distdir
--	-rm -f $(distdir).zip
--	zip -rq $(distdir).zip $(distdir)
-+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- 	$(am__remove_distdir)
- 
- dist dist-all: distdir
--	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- 	$(am__remove_distdir)
- 
- # This target untars the dist file and tries a VPATH configuration.  Then
- # it guarantees that the distribution is self-contained by making another
- # tarfile.
- distcheck: dist
--	case '$(DIST_ARCHIVES)' in \
--	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
--	*.tar.bz2*) \
--	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
--	*.tar.Z*) \
--	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
--	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
--	*.zip*) \
--	  unzip $(distdir).zip ;;\
--	esac
-+	$(am__remove_distdir)
-+	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
- 	chmod -R a-w $(distdir); chmod a+w $(distdir)
- 	mkdir $(distdir)/_build
- 	mkdir $(distdir)/_inst
-@@ -763,20 +1735,19 @@
- 	        distuninstallcheck \
- 	  && chmod -R a-w "$$dc_install_base" \
- 	  && ({ \
--	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
- 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
- 	  && rm -rf "$$dc_destdir" \
--	  && $(MAKE) $(AM_MAKEFLAGS) dist \
--	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-+	  && rm -f $(distdir).tar.gz \
- 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- 	$(am__remove_distdir)
--	@(echo "$(distdir) archives ready for distribution: "; \
--	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
--	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+	@echo "$(distdir).tar.gz is ready for distribution" | \
-+	  sed 'h;s/./=/g;p;x;p;x'
- distuninstallcheck:
- 	@cd $(distuninstallcheck_dir) \
- 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -798,10 +1769,9 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LIBRARIES)
-+
- installdirs:
--	for dir in "$(DESTDIR)$(libdir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
--	done
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -821,24 +1791,26 @@
- clean-generic:
- 
- distclean-generic:
--	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
--	-rm -f ${LIBBUILD_DIR}/$(am__dirstamp)
--	-rm -f dev/stdfd/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 	-rm -f dev/stdfd/$(am__dirstamp)
--	-rm -f drivers/incore/$(DEPDIR)/$(am__dirstamp)
--	-rm -f drivers/incore/$(am__dirstamp)
- 	-rm -f drivers/native/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f drivers/yod/$(am__dirstamp)
-+	-rm -f drivers/yod/$(DEPDIR)/$(am__dirstamp)
- 	-rm -f drivers/native/$(am__dirstamp)
--	-rm -f drivers/sockets/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f src/$(am__dirstamp)
-+	-rm -f dev/stdfd/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f drivers/incore/$(am__dirstamp)
- 	-rm -f drivers/sockets/$(am__dirstamp)
--	-rm -f drivers/yod/$(DEPDIR)/$(am__dirstamp)
--	-rm -f drivers/yod/$(am__dirstamp)
-+	-rm -f drivers/sockets/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f drivers/incore/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f ${LIBBUILD_DIR}/$(am__dirstamp)
- 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
--	-rm -f src/$(am__dirstamp)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
- clean-am: clean-generic clean-libLIBRARIES mostlyclean-am
- 
- distclean: distclean-am
-@@ -852,8 +1824,6 @@
- 
- dvi-am:
- 
--html: html-am
--
- info: info-am
- 
- info-am:
-@@ -889,15 +1859,14 @@
- 
- uninstall-am: uninstall-info-am uninstall-libLIBRARIES
- 
--.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
--	clean-generic clean-libLIBRARIES ctags dist dist-all \
--	dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libLIBRARIES ctags dist dist-all dist-gzip distcheck \
- 	distclean distclean-compile distclean-generic distclean-tags \
--	distcleancheck distdir distuninstallcheck dvi dvi-am html \
--	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-libLIBRARIES install-man install-strip \
--	installcheck installcheck-am installdirs maintainer-clean \
-+	distcleancheck distdir distuninstallcheck dvi dvi-am info \
-+	info-am install install-am install-data install-data-am \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-libLIBRARIES install-man install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- 	uninstall-am uninstall-info-am uninstall-libLIBRARIES
-diff -Nurwd lustre-1.8.1.orig/libsysio/tests/Makefile.in lustre-1.8.1/libsysio/tests/Makefile.in
---- lustre-1.8.1.orig/libsysio/tests/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/libsysio/tests/Makefile.in	2009-09-10 11:17:11.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/libsysio/tests/Makefile.in lustre-1.8.2/libsysio/tests/Makefile.in
+--- orig/lustre-1.8.2/libsysio/tests/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/libsysio/tests/Makefile.in	2010-03-03 16:00:17.008633253 +0000
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -79590,10 +80829,10 @@ diff -Nurwd lustre-1.8.1.orig/libsysio/tests/Makefile.in lustre-1.8.1/libsysio/t
  
  
  drv_data.c: $(CONFIG_DEPENDENCIES) $(top_srcdir)/tests/gendrvdata.sh
-diff -Nurwd lustre-1.8.1.orig/lnet/autoconf/Makefile.in lustre-1.8.1/lnet/autoconf/Makefile.in
---- lustre-1.8.1.orig/lnet/autoconf/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/autoconf/Makefile.in	2009-09-10 11:16:56.000000000 +0200
-@@ -119,12 +119,11 @@
+diff -Nurwd orig/lustre-1.8.2/lnet/autoMakefile.in lustre-1.8.2/lnet/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/autoMakefile.in	2010-03-03 16:00:10.763633198 +0000
+@@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
  EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
@@ -79607,7 +80846,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/autoconf/Makefile.in lustre-1.8.1/lnet/autoco
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -79616,7 +80855,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/autoconf/Makefile.in lustre-1.8.1/lnet/autoco
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79627,7 +80866,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/autoconf/Makefile.in lustre-1.8.1/lnet/autoco
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79658,10 +80897,10 @@ diff -Nurwd lustre-1.8.1.orig/lnet/autoconf/Makefile.in lustre-1.8.1/lnet/autoco
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/autoMakefile.in lustre-1.8.1/lnet/autoMakefile.in
---- lustre-1.8.1.orig/lnet/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/autoMakefile.in	2009-09-10 11:16:56.000000000 +0200
-@@ -155,12 +155,11 @@
+diff -Nurwd orig/lustre-1.8.2/lnet/autoconf/Makefile.in lustre-1.8.2/lnet/autoconf/Makefile.in
+--- orig/lustre-1.8.2/lnet/autoconf/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/autoconf/Makefile.in	2010-03-03 16:00:10.811633016 +0000
+@@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
  EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
@@ -79675,7 +80914,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/autoMakefile.in lustre-1.8.1/lnet/autoMakefil
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -79684,7 +80923,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/autoMakefile.in lustre-1.8.1/lnet/autoMakefil
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79695,7 +80934,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/autoMakefile.in lustre-1.8.1/lnet/autoMakefil
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79726,9 +80965,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/autoMakefile.in lustre-1.8.1/lnet/autoMakefil
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/doc/Makefile.in lustre-1.8.1/lnet/doc/Makefile.in
---- lustre-1.8.1.orig/lnet/doc/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/doc/Makefile.in	2009-09-10 11:16:57.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/doc/Makefile.in lustre-1.8.2/lnet/doc/Makefile.in
+--- orig/lustre-1.8.2/lnet/doc/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/doc/Makefile.in	2010-03-03 16:00:10.859633601 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -79743,7 +80982,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/doc/Makefile.in lustre-1.8.1/lnet/doc/Makefil
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -79752,7 +80991,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/doc/Makefile.in lustre-1.8.1/lnet/doc/Makefil
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79763,7 +81002,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/doc/Makefile.in lustre-1.8.1/lnet/doc/Makefil
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79794,9 +81033,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/doc/Makefile.in lustre-1.8.1/lnet/doc/Makefil
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/linux/Makefile.in lustre-1.8.1/lnet/include/libcfs/linux/Makefile.in
---- lustre-1.8.1.orig/lnet/include/libcfs/linux/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/include/libcfs/linux/Makefile.in	2009-09-10 11:16:57.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/include/Makefile.in lustre-1.8.2/lnet/include/Makefile.in
+--- orig/lustre-1.8.2/lnet/include/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/include/Makefile.in	2010-03-03 16:00:10.911634342 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -79811,7 +81050,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/linux/Makefile.in lustre-1.8.1
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -79820,7 +81059,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/linux/Makefile.in lustre-1.8.1
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79831,7 +81070,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/linux/Makefile.in lustre-1.8.1
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79862,9 +81101,23 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/linux/Makefile.in lustre-1.8.1
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/Makefile.in lustre-1.8.1/lnet/include/libcfs/Makefile.in
---- lustre-1.8.1.orig/lnet/include/libcfs/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/include/libcfs/Makefile.in	2009-09-10 11:16:57.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/include/libcfs/Makefile.am lustre-1.8.2/lnet/include/libcfs/Makefile.am
+--- orig/lustre-1.8.2/lnet/include/libcfs/Makefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/include/libcfs/Makefile.am	2010-03-03 15:57:14.823633491 +0000
+@@ -1,7 +1,7 @@
+ SUBDIRS := linux
+-if DARWIN
+-SUBDIRS += darwin
+-endif
++#if DARWIN
++#SUBDIRS += darwin
++#endif
+ DIST_SUBDIRS := $(SUBDIRS)
+ 
+ EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
+diff -Nurwd orig/lustre-1.8.2/lnet/include/libcfs/Makefile.in lustre-1.8.2/lnet/include/libcfs/Makefile.in
+--- orig/lustre-1.8.2/lnet/include/libcfs/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/include/libcfs/Makefile.in	2010-03-03 16:00:10.963634383 +0000
 @@ -38,7 +38,6 @@
  build_triplet = @build@
  host_triplet = @host@
@@ -79887,7 +81140,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/Makefile.in lustre-1.8.1/lnet/
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -237,8 +235,6 @@
+@@ -241,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -79896,7 +81149,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/Makefile.in lustre-1.8.1/lnet/
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -252,8 +248,10 @@
+@@ -256,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79907,7 +81160,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/Makefile.in lustre-1.8.1/lnet/
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -261,26 +259,27 @@
+@@ -265,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79938,7 +81191,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/Makefile.in lustre-1.8.1/lnet/
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -292,7 +291,10 @@
+@@ -295,7 +294,10 @@
  target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
@@ -79950,9 +81203,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/libcfs/Makefile.in lustre-1.8.1/lnet/
  DIST_SUBDIRS := $(SUBDIRS)
  
  EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
-diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/linux/Makefile.in lustre-1.8.1/lnet/include/lnet/linux/Makefile.in
---- lustre-1.8.1.orig/lnet/include/lnet/linux/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/include/lnet/linux/Makefile.in	2009-09-10 11:16:57.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/include/libcfs/linux/Makefile.in lustre-1.8.2/lnet/include/libcfs/linux/Makefile.in
+--- orig/lustre-1.8.2/lnet/include/libcfs/linux/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/include/libcfs/linux/Makefile.in	2010-03-03 16:00:11.011633774 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -79967,7 +81220,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/linux/Makefile.in lustre-1.8.1/l
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -79976,7 +81229,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/linux/Makefile.in lustre-1.8.1/l
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79987,7 +81240,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/linux/Makefile.in lustre-1.8.1/l
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80018,9 +81271,41 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/linux/Makefile.in lustre-1.8.1/l
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/Makefile.in lustre-1.8.1/lnet/include/lnet/Makefile.in
---- lustre-1.8.1.orig/lnet/include/lnet/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/include/lnet/Makefile.in	2009-09-10 11:16:57.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/include/libcfs/user-prim.h lustre-1.8.2/lnet/include/libcfs/user-prim.h
+--- orig/lustre-1.8.2/lnet/include/libcfs/user-prim.h	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/include/libcfs/user-prim.h	2010-03-03 15:57:14.775659583 +0000
+@@ -139,6 +139,12 @@
+ 
+ #else
+ 
++#ifndef PAGE_SHIFT
++#define PAGE_SHIFT 12 /* 4KB page size if not defined */
++#endif
++#ifndef PAGE_SIZE
++#define PAGE_SIZE ((__u64)1 << PAGE_SHIFT)
++#endif
+ #define CFS_PAGE_SIZE                   PAGE_SIZE
+ #define CFS_PAGE_SHIFT                  PAGE_SHIFT
+ #define CFS_PAGE_MASK                   (~((__u64)CFS_PAGE_SIZE-1))
+diff -Nurwd orig/lustre-1.8.2/lnet/include/lnet/Makefile.am lustre-1.8.2/lnet/include/lnet/Makefile.am
+--- orig/lustre-1.8.2/lnet/include/lnet/Makefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/include/lnet/Makefile.am	2010-03-03 15:57:14.823633491 +0000
+@@ -1,9 +1,9 @@
+ lnetdir=$(includedir)/lnet
+ 
+ SUBDIRS := linux
+-if DARWIN
+-SUBDIRS += darwin
+-endif
++#if DARWIN
++#SUBDIRS += darwin
++#endif
+ DIST_SUBDIRS := $(SUBDIRS)
+ 
+ EXTRA_DIST = api.h api-support.h \
+diff -Nurwd orig/lustre-1.8.2/lnet/include/lnet/Makefile.in lustre-1.8.2/lnet/include/lnet/Makefile.in
+--- orig/lustre-1.8.2/lnet/include/lnet/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/include/lnet/Makefile.in	2010-03-03 16:00:11.063634514 +0000
 @@ -38,7 +38,6 @@
  build_triplet = @build@
  host_triplet = @host@
@@ -80043,7 +81328,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/Makefile.in lustre-1.8.1/lnet/in
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -237,8 +235,6 @@
+@@ -241,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80052,7 +81337,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/Makefile.in lustre-1.8.1/lnet/in
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -252,8 +248,10 @@
+@@ -256,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80063,7 +81348,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/Makefile.in lustre-1.8.1/lnet/in
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -261,26 +259,27 @@
+@@ -265,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80094,7 +81379,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/Makefile.in lustre-1.8.1/lnet/in
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -294,7 +293,10 @@
+@@ -297,7 +296,10 @@
  target_vendor = @target_vendor@
  lnetdir = $(includedir)/lnet
  
@@ -80106,9 +81391,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/lnet/Makefile.in lustre-1.8.1/lnet/in
  DIST_SUBDIRS := $(SUBDIRS)
  
  EXTRA_DIST = api.h api-support.h \
-diff -Nurwd lustre-1.8.1.orig/lnet/include/Makefile.in lustre-1.8.1/lnet/include/Makefile.in
---- lustre-1.8.1.orig/lnet/include/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/include/Makefile.in	2009-09-10 11:16:57.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/include/lnet/linux/Makefile.in lustre-1.8.2/lnet/include/lnet/linux/Makefile.in
+--- orig/lustre-1.8.2/lnet/include/lnet/linux/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/include/lnet/linux/Makefile.in	2010-03-03 16:00:11.111633075 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80123,7 +81408,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/Makefile.in lustre-1.8.1/lnet/include
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80132,7 +81417,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/Makefile.in lustre-1.8.1/lnet/include
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80143,7 +81428,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/Makefile.in lustre-1.8.1/lnet/include
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80174,9 +81459,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/include/Makefile.in lustre-1.8.1/lnet/include
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/autoMakefile.in lustre-1.8.1/lnet/klnds/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/autoMakefile.in	2009-09-10 11:16:57.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/autoMakefile.in lustre-1.8.2/lnet/klnds/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/autoMakefile.in	2010-03-03 16:00:11.163633680 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80191,7 +81476,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/autoMakefile.in lustre-1.8.1/lnet/klnds
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80200,7 +81485,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/autoMakefile.in lustre-1.8.1/lnet/klnds
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80211,7 +81496,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/autoMakefile.in lustre-1.8.1/lnet/klnds
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80242,9 +81527,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/autoMakefile.in lustre-1.8.1/lnet/klnds
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ciblnd/autoMakefile.in lustre-1.8.1/lnet/klnds/ciblnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/ciblnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/ciblnd/autoMakefile.in	2009-09-10 11:16:57.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/ciblnd/autoMakefile.in lustre-1.8.2/lnet/klnds/ciblnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/ciblnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/ciblnd/autoMakefile.in	2010-03-03 16:00:11.215635053 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80259,7 +81544,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ciblnd/autoMakefile.in lustre-1.8.1/lne
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80268,7 +81553,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ciblnd/autoMakefile.in lustre-1.8.1/lne
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80279,7 +81564,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ciblnd/autoMakefile.in lustre-1.8.1/lne
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80310,9 +81595,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ciblnd/autoMakefile.in lustre-1.8.1/lne
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/gmlnd/autoMakefile.in lustre-1.8.1/lnet/klnds/gmlnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/gmlnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/gmlnd/autoMakefile.in	2009-09-10 11:16:58.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/gmlnd/autoMakefile.in lustre-1.8.2/lnet/klnds/gmlnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/gmlnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/gmlnd/autoMakefile.in	2010-03-03 16:00:11.267632659 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80327,7 +81612,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/gmlnd/autoMakefile.in lustre-1.8.1/lnet
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80336,7 +81621,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/gmlnd/autoMakefile.in lustre-1.8.1/lnet
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80347,7 +81632,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/gmlnd/autoMakefile.in lustre-1.8.1/lnet
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80378,9 +81663,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/gmlnd/autoMakefile.in lustre-1.8.1/lnet
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/iiblnd/autoMakefile.in lustre-1.8.1/lnet/klnds/iiblnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/iiblnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/iiblnd/autoMakefile.in	2009-09-10 11:16:58.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/iiblnd/autoMakefile.in lustre-1.8.2/lnet/klnds/iiblnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/iiblnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/iiblnd/autoMakefile.in	2010-03-03 16:00:11.319633265 +0000
 @@ -154,12 +154,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80395,7 +81680,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/iiblnd/autoMakefile.in lustre-1.8.1/lne
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80404,7 +81689,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/iiblnd/autoMakefile.in lustre-1.8.1/lne
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80415,7 +81700,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/iiblnd/autoMakefile.in lustre-1.8.1/lne
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80446,9 +81731,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/iiblnd/autoMakefile.in lustre-1.8.1/lne
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/mxlnd/autoMakefile.in lustre-1.8.1/lnet/klnds/mxlnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/mxlnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/mxlnd/autoMakefile.in	2009-09-10 11:16:58.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/mxlnd/autoMakefile.in lustre-1.8.2/lnet/klnds/mxlnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/mxlnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/mxlnd/autoMakefile.in	2010-03-03 16:00:11.367633431 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80463,7 +81748,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/mxlnd/autoMakefile.in lustre-1.8.1/lnet
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80472,7 +81757,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/mxlnd/autoMakefile.in lustre-1.8.1/lnet
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80483,7 +81768,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/mxlnd/autoMakefile.in lustre-1.8.1/lnet
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80514,9 +81799,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/mxlnd/autoMakefile.in lustre-1.8.1/lnet
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/o2iblnd/autoMakefile.in lustre-1.8.1/lnet/klnds/o2iblnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/o2iblnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/o2iblnd/autoMakefile.in	2009-09-10 11:16:58.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/o2iblnd/autoMakefile.in lustre-1.8.2/lnet/klnds/o2iblnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/o2iblnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/o2iblnd/autoMakefile.in	2010-03-03 16:00:11.423633912 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80531,7 +81816,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/o2iblnd/autoMakefile.in lustre-1.8.1/ln
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80540,7 +81825,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/o2iblnd/autoMakefile.in lustre-1.8.1/ln
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80551,7 +81836,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/o2iblnd/autoMakefile.in lustre-1.8.1/ln
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80582,9 +81867,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/o2iblnd/autoMakefile.in lustre-1.8.1/ln
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/openiblnd/autoMakefile.in lustre-1.8.1/lnet/klnds/openiblnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/openiblnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/openiblnd/autoMakefile.in	2009-09-10 11:16:58.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/openiblnd/autoMakefile.in lustre-1.8.2/lnet/klnds/openiblnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/openiblnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/openiblnd/autoMakefile.in	2010-03-03 16:00:11.471634142 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80599,7 +81884,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/openiblnd/autoMakefile.in lustre-1.8.1/
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80608,7 +81893,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/openiblnd/autoMakefile.in lustre-1.8.1/
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80619,7 +81904,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/openiblnd/autoMakefile.in lustre-1.8.1/
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80650,9 +81935,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/openiblnd/autoMakefile.in lustre-1.8.1/
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ptllnd/autoMakefile.in lustre-1.8.1/lnet/klnds/ptllnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/ptllnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/ptllnd/autoMakefile.in	2009-09-10 11:16:58.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/ptllnd/autoMakefile.in lustre-1.8.2/lnet/klnds/ptllnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/ptllnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/ptllnd/autoMakefile.in	2010-03-03 16:00:11.523633414 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80667,7 +81952,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ptllnd/autoMakefile.in lustre-1.8.1/lne
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -237,8 +236,6 @@
+@@ -241,8 +240,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80676,7 +81961,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ptllnd/autoMakefile.in lustre-1.8.1/lne
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -252,8 +249,10 @@
+@@ -256,8 +253,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80687,7 +81972,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ptllnd/autoMakefile.in lustre-1.8.1/lne
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -261,26 +260,27 @@
+@@ -265,26 +264,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80718,9 +82003,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ptllnd/autoMakefile.in lustre-1.8.1/lne
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/qswlnd/autoMakefile.in lustre-1.8.1/lnet/klnds/qswlnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/qswlnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/qswlnd/autoMakefile.in	2009-09-10 11:16:58.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/qswlnd/autoMakefile.in lustre-1.8.2/lnet/klnds/qswlnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/qswlnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/qswlnd/autoMakefile.in	2010-03-03 16:00:11.575632757 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80735,7 +82020,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/qswlnd/autoMakefile.in lustre-1.8.1/lne
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80744,7 +82029,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/qswlnd/autoMakefile.in lustre-1.8.1/lne
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80755,7 +82040,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/qswlnd/autoMakefile.in lustre-1.8.1/lne
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80786,9 +82071,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/qswlnd/autoMakefile.in lustre-1.8.1/lne
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ralnd/autoMakefile.in lustre-1.8.1/lnet/klnds/ralnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/ralnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/ralnd/autoMakefile.in	2009-09-10 11:16:58.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/ralnd/autoMakefile.in lustre-1.8.2/lnet/klnds/ralnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/ralnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/ralnd/autoMakefile.in	2010-03-03 16:00:11.627633154 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80803,7 +82088,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ralnd/autoMakefile.in lustre-1.8.1/lnet
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80812,7 +82097,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ralnd/autoMakefile.in lustre-1.8.1/lnet
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80823,7 +82108,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ralnd/autoMakefile.in lustre-1.8.1/lnet
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80854,9 +82139,48 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/ralnd/autoMakefile.in lustre-1.8.1/lnet
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/lnet/klnds/socklnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/socklnd/autoMakefile.in	2009-09-10 11:16:58.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.am lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.am
+--- orig/lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.am	2010-03-03 15:57:14.823633491 +0000
+@@ -6,21 +6,21 @@
+ endif # LINUX
+ endif # MODULES
+ 
+-if DARWIN
+-
+-  macos_PROGRAMS := ksocklnd
+-
+-  nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
+-
+-  ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
+-  ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
+-  ksocklnd_LDADD := $(EXTRA_KLIBS)
+-
+-  plist_DATA := Info.plist
+-  install_data_hook := fix-kext-ownership
++#if DARWIN
++#
++#  macos_PROGRAMS := ksocklnd
++#
++#  nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
++#
++#  ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
++#  ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
++#  ksocklnd_LDADD := $(EXTRA_KLIBS)
++#
++#  plist_DATA := Info.plist
++#  install_data_hook := fix-kext-ownership
+ 
+-  EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
+-endif # DARWIN
++#  EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
++#endif # DARWIN
+ 
+ install-data-hook: $(install_data_hook)
+ 
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.in	2010-03-03 16:00:11.675633809 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -80871,7 +82195,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -237,8 +236,6 @@
+@@ -241,8 +240,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -80880,7 +82204,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -252,8 +249,10 @@
+@@ -256,8 +253,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80891,7 +82215,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -261,26 +260,27 @@
+@@ -265,26 +264,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80922,7 +82246,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -294,59 +294,18 @@
+@@ -297,59 +297,18 @@
  target_vendor = @target_vendor@
  
  @LINUX_TRUE@@MODULES_TRUE at modulenet_DATA := ksocklnd$(KMODEXT)
@@ -80983,7 +82307,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  $(srcdir)/autoMakefile.in:  autoMakefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  lnet/klnds/socklnd/autoMakefile
-@@ -354,177 +313,6 @@
+@@ -357,177 +316,6 @@
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  Makefile: $(top_builddir)/config.status Makefile.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -81161,7 +82485,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  uninstall-info-am:
  modulenetDATA_INSTALL = $(INSTALL_DATA)
  install-modulenetDATA: $(modulenet_DATA)
-@@ -544,78 +332,12 @@
+@@ -547,78 +335,12 @@
  	  echo " rm -f $(DESTDIR)$(modulenetdir)/$$f"; \
  	  rm -f $(DESTDIR)$(modulenetdir)/$$f; \
  	done
@@ -81242,7 +82566,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  
  top_distdir = ../../..
-@@ -650,10 +372,10 @@
+@@ -653,10 +375,10 @@
  	done
  check-am: all-am
  check: check-am
@@ -81255,7 +82579,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -681,13 +403,11 @@
+@@ -684,13 +406,11 @@
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
@@ -81271,7 +82595,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  
  dvi: dvi-am
  
-@@ -697,8 +417,7 @@
+@@ -700,8 +420,7 @@
  
  info-am:
  
@@ -81281,7 +82605,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
  
-@@ -711,13 +430,12 @@
+@@ -714,13 +433,12 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
@@ -81296,7 +82620,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  
  pdf: pdf-am
  
-@@ -727,22 +445,34 @@
+@@ -730,22 +448,34 @@
  
  ps-am:
  
@@ -81345,9 +82669,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/socklnd/autoMakefile.in lustre-1.8.1/ln
  
  install-data-hook: $(install_data_hook)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -Nurwd lustre-1.8.1.orig/lnet/klnds/viblnd/autoMakefile.in lustre-1.8.1/lnet/klnds/viblnd/autoMakefile.in
---- lustre-1.8.1.orig/lnet/klnds/viblnd/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/klnds/viblnd/autoMakefile.in	2009-09-10 11:16:59.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/klnds/viblnd/autoMakefile.in lustre-1.8.2/lnet/klnds/viblnd/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/klnds/viblnd/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/viblnd/autoMakefile.in	2010-03-03 16:00:11.727633926 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -81362,7 +82686,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/viblnd/autoMakefile.in lustre-1.8.1/lne
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -81371,7 +82695,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/viblnd/autoMakefile.in lustre-1.8.1/lne
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81382,7 +82706,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/viblnd/autoMakefile.in lustre-1.8.1/lne
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81413,9 +82737,70 @@ diff -Nurwd lustre-1.8.1.orig/lnet/klnds/viblnd/autoMakefile.in lustre-1.8.1/lne
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libcfs/autoMakefile.in
---- lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/libcfs/autoMakefile.in	2009-09-10 11:16:59.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/libcfs/autoMakefile.am lustre-1.8.2/lnet/libcfs/autoMakefile.am
+--- orig/lustre-1.8.2/lnet/libcfs/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/libcfs/autoMakefile.am	2010-03-03 15:57:14.827661168 +0000
+@@ -35,9 +35,9 @@
+ #
+ 
+ SUBDIRS := linux
+-if DARWIN
+-SUBDIRS += darwin
+-endif
++#if DARWIN
++#SUBDIRS += darwin
++#endif
+ DIST_SUBDIRS := $(SUBDIRS)
+ 
+ if LIBLUSTRE
+@@ -53,25 +53,25 @@
+ modulenet_DATA := libcfs$(KMODEXT)
+ endif
+ 
+-if DARWIN
+-macos_PROGRAMS := libcfs
+-
+-nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.c	\
+-	darwin/darwin-prim.c darwin/darwin-fs.c darwin/darwin-curproc.c	\
+-	darwin/darwin-tcpip.c darwin/darwin-utils.c 			\
+-	darwin/darwin-debug.c darwin/darwin-proc.c 			\
+-	darwin/darwin-tracefile.c darwin/darwin-module.c 		\
+-	debug.c module.c tracefile.c nidstrings.c watchdog.c
+-
+-libcfs_CFLAGS := $(EXTRA_KCFLAGS)
+-libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
+-libcfs_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif
++#if DARWIN
++#macos_PROGRAMS := libcfs
++#
++#nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.c	\
++#	darwin/darwin-prim.c darwin/darwin-fs.c darwin/darwin-curproc.c	\
++#	darwin/darwin-tcpip.c darwin/darwin-utils.c 			\
++#	darwin/darwin-debug.c darwin/darwin-proc.c 			\
++#	darwin/darwin-tracefile.c darwin/darwin-module.c 		\
++#	debug.c module.c tracefile.c nidstrings.c watchdog.c
++#
++#libcfs_CFLAGS := $(EXTRA_KCFLAGS)
++#libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
++#libcfs_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif
+ 
+ endif
+ 
+diff -Nurwd orig/lustre-1.8.2/lnet/libcfs/autoMakefile.in lustre-1.8.2/lnet/libcfs/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/libcfs/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/libcfs/autoMakefile.in	2010-03-03 16:00:11.819632288 +0000
 @@ -74,7 +74,6 @@
  build_triplet = @build@
  host_triplet = @host@
@@ -81438,7 +82823,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -274,8 +272,6 @@
+@@ -278,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -81447,7 +82832,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -289,8 +285,10 @@
+@@ -293,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81458,7 +82843,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -298,26 +296,27 @@
+@@ -302,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81489,7 +82874,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -330,7 +329,10 @@
+@@ -333,7 +332,10 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
  
@@ -81501,7 +82886,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  DIST_SUBDIRS := $(SUBDIRS)
  
  @LIBLUSTRE_TRUE at noinst_LIBRARIES = libcfs.a
-@@ -339,24 +341,6 @@
+@@ -342,24 +344,6 @@
  @LIBLUSTRE_TRUE at libcfs_a_CFLAGS = $(LLCFLAGS)
  
  @LINUX_TRUE@@MODULES_TRUE at modulenet_DATA := libcfs$(KMODEXT)
@@ -81526,7 +82911,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  subdir = lnet/libcfs
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -374,55 +358,11 @@
+@@ -377,55 +361,11 @@
  @LIBLUSTRE_TRUE@	libcfs_a-user-tcpip.$(OBJEXT) \
  @LIBLUSTRE_TRUE@	libcfs_a-user-bitops.$(OBJEXT)
  libcfs_a_OBJECTS = $(am_libcfs_a_OBJECTS)
@@ -81583,7 +82968,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  @AMDEP_TRUE@	./$(DEPDIR)/libcfs_a-user-bitops.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/libcfs_a-user-lock.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/libcfs_a-user-prim.Po \
-@@ -432,7 +372,7 @@
+@@ -435,7 +375,7 @@
  CCLD = $(CC)
  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(am__libcfs_a_SOURCES_DIST)
@@ -81592,7 +82977,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  
  
  RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-@@ -441,7 +381,7 @@
+@@ -444,7 +384,7 @@
  	installdirs-recursive install-recursive uninstall-recursive \
  	check-recursive installcheck-recursive
  DIST_COMMON = $(srcdir)/autoMakefile.in Makefile.in autoMakefile.am
@@ -81601,7 +82986,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  
  all: all-recursive
  
-@@ -463,33 +403,6 @@
+@@ -466,33 +406,6 @@
  	-rm -f libcfs.a
  	$(libcfs_a_AR) libcfs.a $(libcfs_a_OBJECTS) $(libcfs_a_LIBADD)
  	$(RANLIB) libcfs.a
@@ -81635,7 +83020,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT) core *.core
-@@ -497,22 +410,6 @@
+@@ -500,22 +413,6 @@
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -81658,7 +83043,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcfs_a-debug.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcfs_a-user-bitops.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcfs_a-user-lock.Po at am__quote@
-@@ -650,358 +547,6 @@
+@@ -653,358 +550,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcfs_a-user-bitops.Po' tmpdepfile='$(DEPDIR)/libcfs_a-user-bitops.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcfs_a_CPPFLAGS) $(CPPFLAGS) $(libcfs_a_CFLAGS) $(CFLAGS) -c -o libcfs_a-user-bitops.obj `if test -f 'user-bitops.c'; then $(CYGPATH_W) 'user-bitops.c'; else $(CYGPATH_W) '$(srcdir)/user-bitops.c'; fi`
@@ -82017,7 +83402,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  uninstall-info-am:
  modulenetDATA_INSTALL = $(INSTALL_DATA)
  install-modulenetDATA: $(modulenet_DATA)
-@@ -1021,24 +566,6 @@
+@@ -1024,24 +569,6 @@
  	  echo " rm -f $(DESTDIR)$(modulenetdir)/$$f"; \
  	  rm -f $(DESTDIR)$(modulenetdir)/$$f; \
  	done
@@ -82042,7 +83427,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -1210,10 +737,10 @@
+@@ -1213,10 +740,10 @@
  	done
  check-am: all-am
  check: check-recursive
@@ -82055,7 +83440,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  
  install: install-recursive
  install-exec: install-exec-recursive
-@@ -1242,8 +769,7 @@
+@@ -1245,8 +772,7 @@
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-recursive
  
@@ -82065,7 +83450,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  
  distclean: distclean-recursive
  	-rm -rf ./$(DEPDIR)
-@@ -1259,8 +785,7 @@
+@@ -1262,8 +788,7 @@
  
  info-am:
  
@@ -82075,7 +83460,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
  
-@@ -1289,30 +814,48 @@
+@@ -1292,30 +817,48 @@
  
  ps-am:
  
@@ -82143,9 +83528,29 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/autoMakefile.in lustre-1.8.1/lnet/libc
  
  install-data-hook: $(install_data_hook)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/linux/Makefile.in lustre-1.8.1/lnet/libcfs/linux/Makefile.in
---- lustre-1.8.1.orig/lnet/libcfs/linux/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/libcfs/linux/Makefile.in	2009-09-10 11:16:59.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/libcfs/debug.c lustre-1.8.2/lnet/libcfs/debug.c
+--- orig/lustre-1.8.2/lnet/libcfs/debug.c	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/libcfs/debug.c	2010-03-03 15:57:14.807656390 +0000
+@@ -52,13 +52,13 @@
+ static char debug_file_name[1024];
+ 
+ #ifdef __KERNEL__
+-unsigned int libcfs_subsystem_debug = ~0;
++unsigned int libcfs_subsystem_debug = 0;
+ CFS_MODULE_PARM(libcfs_subsystem_debug, "i", int, 0644,
+                 "Lustre kernel debug subsystem mask");
+ EXPORT_SYMBOL(libcfs_subsystem_debug);
+ 
+-unsigned int libcfs_debug = (D_EMERG | D_ERROR | D_WARNING | D_CONSOLE |
+-                             D_NETERROR | D_HA | D_CONFIG | D_IOCTL);
++unsigned int libcfs_debug = 0;
++
+ CFS_MODULE_PARM(libcfs_debug, "i", int, 0644,
+                 "Lustre kernel debug mask");
+ EXPORT_SYMBOL(libcfs_debug);
+diff -Nurwd orig/lustre-1.8.2/lnet/libcfs/linux/Makefile.in lustre-1.8.2/lnet/libcfs/linux/Makefile.in
+--- orig/lustre-1.8.2/lnet/libcfs/linux/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/libcfs/linux/Makefile.in	2010-03-03 16:00:11.863634250 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -82160,7 +83565,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/linux/Makefile.in lustre-1.8.1/lnet/li
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -82169,7 +83574,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/linux/Makefile.in lustre-1.8.1/lnet/li
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82180,7 +83585,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/linux/Makefile.in lustre-1.8.1/lnet/li
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82211,9 +83616,53 @@ diff -Nurwd lustre-1.8.1.orig/lnet/libcfs/linux/Makefile.in lustre-1.8.1/lnet/li
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/autoMakefile.in
---- lustre-1.8.1.orig/lnet/lnet/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/lnet/autoMakefile.in	2009-09-10 11:16:59.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/lnet/autoMakefile.am lustre-1.8.2/lnet/lnet/autoMakefile.am
+--- orig/lustre-1.8.2/lnet/lnet/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/lnet/autoMakefile.am	2010-03-03 15:57:14.827661168 +0000
+@@ -18,23 +18,23 @@
+ modulenet_DATA = lnet$(KMODEXT)
+ endif # LINUX
+ 
+-if DARWIN
+-macos_PROGRAMS := lnet
+-
+-lnet_SOURCES := api-errno.c api-ni.c config.c
+-lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c
+-lnet_SOURCES += lib-move.c module.c lo.c router.c router_proc.c
+-lnet_SOURCES += acceptor.c peer.c
+-
+-lnet_CFLAGS := $(EXTRA_KCFLAGS)
+-lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
+-lnet_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#if DARWIN
++#macos_PROGRAMS := lnet
++#
++#lnet_SOURCES := api-errno.c api-ni.c config.c
++#lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c
++#lnet_SOURCES += lib-move.c module.c lo.c router.c router_proc.c
++#lnet_SOURCES += acceptor.c peer.c
++#
++#lnet_CFLAGS := $(EXTRA_KCFLAGS)
++#lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
++#lnet_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+ 
+ endif # MODULES
+ 
+diff -Nurwd orig/lustre-1.8.2/lnet/lnet/autoMakefile.in lustre-1.8.2/lnet/lnet/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/lnet/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/lnet/autoMakefile.in	2010-03-03 16:00:11.979632853 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -82228,7 +83677,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -237,8 +236,6 @@
+@@ -241,8 +240,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -82237,7 +83686,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -252,8 +249,10 @@
+@@ -256,8 +253,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82248,7 +83697,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -261,26 +260,27 @@
+@@ -265,26 +264,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82279,7 +83728,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -306,18 +306,6 @@
+@@ -309,18 +309,6 @@
  
  @LINUX_TRUE@@MODULES_TRUE at modulenet_DATA = lnet$(KMODEXT)
  
@@ -82298,7 +83747,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  EXTRA_DIST := Info.plist
  subdir = lnet/lnet
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -340,34 +328,6 @@
+@@ -343,34 +331,6 @@
  	liblnet_a-peer.$(OBJEXT)
  @LIBLUSTRE_TRUE at am_liblnet_a_OBJECTS = $(am__objects_1)
  liblnet_a_OBJECTS = $(am_liblnet_a_OBJECTS)
@@ -82333,7 +83782,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -384,28 +344,16 @@
+@@ -387,28 +347,16 @@
  @AMDEP_TRUE@	./$(DEPDIR)/liblnet_a-lo.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/liblnet_a-peer.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/liblnet_a-router.Po \
@@ -82366,7 +83815,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  
  all: all-am
  
-@@ -427,33 +375,6 @@
+@@ -430,33 +378,6 @@
  	-rm -f liblnet.a
  	$(liblnet_a_AR) liblnet.a $(liblnet_a_OBJECTS) $(liblnet_a_LIBADD)
  	$(RANLIB) liblnet.a
@@ -82400,7 +83849,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT) core *.core
-@@ -474,20 +395,6 @@
+@@ -477,20 +398,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblnet_a-peer.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblnet_a-router.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblnet_a-router_proc.Po at am__quote@
@@ -82421,7 +83870,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  
  .c.o:
  @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@@ -796,314 +703,6 @@
+@@ -799,314 +706,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblnet_a-peer.Po' tmpdepfile='$(DEPDIR)/liblnet_a-peer.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblnet_a_CPPFLAGS) $(CPPFLAGS) $(liblnet_a_CFLAGS) $(CFLAGS) -c -o liblnet_a-peer.obj `if test -f 'peer.c'; then $(CYGPATH_W) 'peer.c'; else $(CYGPATH_W) '$(srcdir)/peer.c'; fi`
@@ -82736,7 +84185,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  uninstall-info-am:
  modulenetDATA_INSTALL = $(INSTALL_DATA)
  install-modulenetDATA: $(modulenet_DATA)
-@@ -1123,24 +722,6 @@
+@@ -1126,24 +725,6 @@
  	  echo " rm -f $(DESTDIR)$(modulenetdir)/$$f"; \
  	  rm -f $(DESTDIR)$(modulenetdir)/$$f; \
  	done
@@ -82761,7 +84210,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  
  ETAGS = etags
  ETAGSFLAGS =
-@@ -1229,10 +810,10 @@
+@@ -1232,10 +813,10 @@
  	done
  check-am: all-am
  check: check-am
@@ -82774,7 +84223,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -1260,8 +841,7 @@
+@@ -1263,8 +844,7 @@
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
@@ -82784,7 +84233,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  
  distclean: distclean-am
  	-rm -rf ./$(DEPDIR)
-@@ -1277,8 +857,7 @@
+@@ -1280,8 +860,7 @@
  
  info-am:
  
@@ -82794,7 +84243,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
  
-@@ -1307,23 +886,38 @@
+@@ -1310,23 +889,38 @@
  
  ps-am:
  
@@ -82844,9 +84293,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/lnet/autoMakefile.in lustre-1.8.1/lnet/lnet/a
  install-data-hook: $(install_data_hook)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nurwd lustre-1.8.1.orig/lnet/selftest/autoMakefile.in lustre-1.8.1/lnet/selftest/autoMakefile.in
---- lustre-1.8.1.orig/lnet/selftest/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/selftest/autoMakefile.in	2009-09-10 11:16:59.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/selftest/autoMakefile.in lustre-1.8.2/lnet/selftest/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/selftest/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/selftest/autoMakefile.in	2010-03-03 16:00:12.091635491 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -82861,7 +84310,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/selftest/autoMakefile.in lustre-1.8.1/lnet/se
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -237,8 +236,6 @@
+@@ -241,8 +240,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -82870,7 +84319,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/selftest/autoMakefile.in lustre-1.8.1/lnet/se
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -252,8 +249,10 @@
+@@ -256,8 +253,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82881,7 +84330,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/selftest/autoMakefile.in lustre-1.8.1/lnet/se
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -261,26 +260,27 @@
+@@ -265,26 +264,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82912,9 +84361,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/selftest/autoMakefile.in lustre-1.8.1/lnet/se
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/autoMakefile.in lustre-1.8.1/lnet/ulnds/autoMakefile.in
---- lustre-1.8.1.orig/lnet/ulnds/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/ulnds/autoMakefile.in	2009-09-10 11:17:00.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/ulnds/autoMakefile.in lustre-1.8.2/lnet/ulnds/autoMakefile.in
+--- orig/lustre-1.8.2/lnet/ulnds/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/ulnds/autoMakefile.in	2010-03-03 16:00:12.147635348 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -82929,7 +84378,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/autoMakefile.in lustre-1.8.1/lnet/ulnds
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -82938,7 +84387,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/autoMakefile.in lustre-1.8.1/lnet/ulnds
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82949,7 +84398,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/autoMakefile.in lustre-1.8.1/lnet/ulnds
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82980,9 +84429,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/autoMakefile.in lustre-1.8.1/lnet/ulnds
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/ptllnd/Makefile.in lustre-1.8.1/lnet/ulnds/ptllnd/Makefile.in
---- lustre-1.8.1.orig/lnet/ulnds/ptllnd/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/ulnds/ptllnd/Makefile.in	2009-09-10 11:17:00.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/ulnds/ptllnd/Makefile.in lustre-1.8.2/lnet/ulnds/ptllnd/Makefile.in
+--- orig/lustre-1.8.2/lnet/ulnds/ptllnd/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/ulnds/ptllnd/Makefile.in	2010-03-03 16:00:12.227633716 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -82997,7 +84446,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/ptllnd/Makefile.in lustre-1.8.1/lnet/ul
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83006,7 +84455,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/ptllnd/Makefile.in lustre-1.8.1/lnet/ul
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83017,7 +84466,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/ptllnd/Makefile.in lustre-1.8.1/lnet/ul
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83048,9 +84497,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/ptllnd/Makefile.in lustre-1.8.1/lnet/ul
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/socklnd/Makefile.in lustre-1.8.1/lnet/ulnds/socklnd/Makefile.in
---- lustre-1.8.1.orig/lnet/ulnds/socklnd/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/ulnds/socklnd/Makefile.in	2009-09-10 11:17:00.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/ulnds/socklnd/Makefile.in lustre-1.8.2/lnet/ulnds/socklnd/Makefile.in
+--- orig/lustre-1.8.2/lnet/ulnds/socklnd/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/ulnds/socklnd/Makefile.in	2010-03-03 16:00:12.319632637 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83065,7 +84514,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/socklnd/Makefile.in lustre-1.8.1/lnet/u
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83074,7 +84523,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/socklnd/Makefile.in lustre-1.8.1/lnet/u
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83085,7 +84534,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/socklnd/Makefile.in lustre-1.8.1/lnet/u
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83116,9 +84565,9 @@ diff -Nurwd lustre-1.8.1.orig/lnet/ulnds/socklnd/Makefile.in lustre-1.8.1/lnet/u
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lnet/utils/Makefile.in lustre-1.8.1/lnet/utils/Makefile.in
---- lustre-1.8.1.orig/lnet/utils/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lnet/utils/Makefile.in	2009-09-10 11:17:00.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lnet/utils/Makefile.in lustre-1.8.2/lnet/utils/Makefile.in
+--- orig/lustre-1.8.2/lnet/utils/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lnet/utils/Makefile.in	2010-03-03 16:00:12.443633240 +0000
 @@ -163,12 +163,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83133,7 +84582,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/utils/Makefile.in lustre-1.8.1/lnet/utils/Mak
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -280,8 +279,6 @@
+@@ -284,8 +283,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83142,7 +84591,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/utils/Makefile.in lustre-1.8.1/lnet/utils/Mak
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -295,8 +292,10 @@
+@@ -299,8 +296,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83153,7 +84602,7 @@ diff -Nurwd lustre-1.8.1.orig/lnet/utils/Makefile.in lustre-1.8.1/lnet/utils/Mak
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -304,26 +303,27 @@
+@@ -308,26 +307,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83184,10 +84633,22 @@ diff -Nurwd lustre-1.8.1.orig/lnet/utils/Makefile.in lustre-1.8.1/lnet/utils/Mak
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/autoconf/Makefile.in lustre-1.8.1/lustre/autoconf/Makefile.in
---- lustre-1.8.1.orig/lustre/autoconf/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/autoconf/Makefile.in	2009-09-10 11:17:01.000000000 +0200
-@@ -119,12 +119,11 @@
+diff -Nurwd orig/lustre-1.8.2/lustre/autoMakefile.am lustre-1.8.2/lustre/autoMakefile.am
+--- orig/lustre-1.8.2/lustre/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/autoMakefile.am	2010-03-03 15:57:14.919642480 +0000
+@@ -85,7 +85,7 @@
+ BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
+ 
+ lustre_build_version:
+-	perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
++	perl $(top_srcdir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
+ 	echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
+ 	cmp -s $(BUILD_VER_H) tmpver > tmpdiff 2> /dev/null &&		\
+                 $(RM) tmpver tmpdiff ||					\
+diff -Nurwd orig/lustre-1.8.2/lustre/autoMakefile.in lustre-1.8.2/lustre/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/autoMakefile.in	2010-03-03 16:00:12.499634694 +0000
+@@ -159,12 +159,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
  EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
@@ -83201,7 +84662,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/autoconf/Makefile.in lustre-1.8.1/lustre/au
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -280,8 +279,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83210,7 +84671,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/autoconf/Makefile.in lustre-1.8.1/lustre/au
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -295,8 +292,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83221,7 +84682,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/autoconf/Makefile.in lustre-1.8.1/lustre/au
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -304,26 +303,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83252,10 +84713,19 @@ diff -Nurwd lustre-1.8.1.orig/lustre/autoconf/Makefile.in lustre-1.8.1/lustre/au
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/autoMakefile.in lustre-1.8.1/lustre/autoMakefile.in
---- lustre-1.8.1.orig/lustre/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/autoMakefile.in	2009-09-10 11:17:00.000000000 +0200
-@@ -159,12 +159,11 @@
+@@ -656,7 +656,7 @@
+ all-recursive: lustre_build_version
+ 
+ lustre_build_version:
+-	perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
++	perl $(top_srcdir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
+ 	echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
+ 	cmp -s $(BUILD_VER_H) tmpver > tmpdiff 2> /dev/null &&		\
+                 $(RM) tmpver tmpdiff ||					\
+diff -Nurwd orig/lustre-1.8.2/lustre/autoconf/Makefile.in lustre-1.8.2/lustre/autoconf/Makefile.in
+--- orig/lustre-1.8.2/lustre/autoconf/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/autoconf/Makefile.in	2010-03-03 16:00:12.551634246 +0000
+@@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
  EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
@@ -83269,7 +84739,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/autoMakefile.in lustre-1.8.1/lustre/autoMak
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -276,8 +275,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83278,7 +84748,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/autoMakefile.in lustre-1.8.1/lustre/autoMak
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -291,8 +288,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83289,7 +84759,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/autoMakefile.in lustre-1.8.1/lustre/autoMak
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -300,26 +299,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83320,18 +84790,20 @@ diff -Nurwd lustre-1.8.1.orig/lustre/autoMakefile.in lustre-1.8.1/lustre/autoMak
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -653,7 +653,7 @@
- all-recursive: lustre_build_version
+diff -Nurwd orig/lustre-1.8.2/lustre/autoconf/lustre-core.m4 lustre-1.8.2/lustre/autoconf/lustre-core.m4
+--- orig/lustre-1.8.2/lustre/autoconf/lustre-core.m4	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/autoconf/lustre-core.m4	2010-03-03 15:57:14.899633653 +0000
+@@ -2066,6 +2066,7 @@
+ ])
+ ])
  
- lustre_build_version:
--	perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
-+	perl $(top_srcdir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
- 	echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
- 	cmp -s $(BUILD_VER_H) tmpver > tmpdiff 2> /dev/null &&		\
-                 $(RM) tmpver tmpdiff ||					\
-diff -Nurwd lustre-1.8.1.orig/lustre/contrib/Makefile.in lustre-1.8.1/lustre/contrib/Makefile.in
---- lustre-1.8.1.orig/lustre/contrib/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/contrib/Makefile.in	2009-09-10 11:17:01.000000000 +0200
++
+ #
+ # LC_COOKIE_FOLLOW_LINK
+ #
+diff -Nurwd orig/lustre-1.8.2/lustre/contrib/Makefile.in lustre-1.8.2/lustre/contrib/Makefile.in
+--- orig/lustre-1.8.2/lustre/contrib/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/contrib/Makefile.in	2010-03-03 16:00:12.599634971 +0000
 @@ -121,12 +121,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83346,7 +84818,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/contrib/Makefile.in lustre-1.8.1/lustre/con
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -238,8 +237,6 @@
+@@ -242,8 +241,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83355,7 +84827,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/contrib/Makefile.in lustre-1.8.1/lustre/con
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -253,8 +250,10 @@
+@@ -257,8 +254,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83366,7 +84838,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/contrib/Makefile.in lustre-1.8.1/lustre/con
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -262,26 +261,27 @@
+@@ -266,26 +265,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83397,9 +84869,43 @@ diff -Nurwd lustre-1.8.1.orig/lustre/contrib/Makefile.in lustre-1.8.1/lustre/con
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/doc/Makefile.in lustre-1.8.1/lustre/doc/Makefile.in
---- lustre-1.8.1.orig/lustre/doc/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/doc/Makefile.in	2009-09-10 11:17:01.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/contrib/bash_completion/lctl lustre-1.8.2/lustre/contrib/bash_completion/lctl
+--- orig/lustre-1.8.2/lustre/contrib/bash_completion/lctl	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/lustre/contrib/bash_completion/lctl	2010-03-03 15:57:14.847642479 +0000
+@@ -0,0 +1,13 @@
++#-*- mode: shell-script;-*-
++
++have lctl &&
++_lctl()
++{
++	local cur
++	COMPREPLY=()
++	cur=${COMP_WORDS[COMP_CWORD]}
++	COMPREPLY=($( compgen -W '--device --threads --ignore-errors ignore-errors dump --net network net list_nids which_nid interface_list add_interface del_interface peer_list add_peer del_peer conn_list disconnect active_tc mynid add_uuid close_uuid del_uuid add_route del_route set_route fail ping newdev device cfg_device device_list dl lustre_build_version attach setup cleanup detach lov_setup lov_modify_tgts lov_getconfig record endrecord parse dump_log clear_log conf_param probe close getattr setattr create destroy test_getattr test_setattr test_brw get_stripe set_stripe unset_stripe dump_ldlm activate deactivate recover lookup notransno readonly abort_recovery mount_option del_mount_option set_timeout set_lustre_upcall add_conn del_conn local_param llog_catlist llog_info llog_print llog_check llog_cancel llog_remove debug_daemon debug_kernel dk debug_file df clear mark filter show debug_list modules panic lwt memhog help' -- $cur ) )
++}
++
++complete -F _lctl lctl
++
+diff -Nurwd orig/lustre-1.8.2/lustre/contrib/bash_completion/lfs lustre-1.8.2/lustre/contrib/bash_completion/lfs
+--- orig/lustre-1.8.2/lustre/contrib/bash_completion/lfs	1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/lustre/contrib/bash_completion/lfs	2010-03-03 15:57:14.847642479 +0000
+@@ -0,0 +1,13 @@
++#-*- mode: shell-script;-*-
++
++have lfs &&
++_lfs()
++{
++	local cur
++	COMPREPLY=()
++	cur=${COMP_WORDS[COMP_CWORD]}
++	COMPREPLY=($( compgen -W 'catinfo join osts help find getstripe setstripe quotachown quotacheck quotaon setquota quota setstripe check df' -- $cur ) )
++}
++
++complete -F _lfs lfs
++
+diff -Nurwd orig/lustre-1.8.2/lustre/doc/Makefile.in lustre-1.8.2/lustre/doc/Makefile.in
+--- orig/lustre-1.8.2/lustre/doc/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/doc/Makefile.in	2010-03-03 16:00:12.663633052 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83414,7 +84920,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/doc/Makefile.in lustre-1.8.1/lustre/doc/Mak
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83423,7 +84929,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/doc/Makefile.in lustre-1.8.1/lustre/doc/Mak
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83434,7 +84940,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/doc/Makefile.in lustre-1.8.1/lustre/doc/Mak
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83465,9 +84971,66 @@ diff -Nurwd lustre-1.8.1.orig/lustre/doc/Makefile.in lustre-1.8.1/lustre/doc/Mak
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/include/linux/Makefile.in lustre-1.8.1/lustre/include/linux/Makefile.in
---- lustre-1.8.1.orig/lustre/include/linux/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/include/linux/Makefile.in	2009-09-10 11:17:01.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/doc/lctl.8 lustre-1.8.2/lustre/doc/lctl.8
+--- orig/lustre-1.8.2/lustre/doc/lctl.8	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/doc/lctl.8	2010-03-03 15:57:14.891633684 +0000
+@@ -36,7 +36,7 @@
+ command, type 
+ .B help 
+ .I command
+-.  Command completion is activated with the TAB key, and command history is available via the up- and down-arrow keys. 
++Command completion is activated with the TAB key, and command history is available via the up- and down-arrow keys. 
+ 
+ For non-interactive use, one uses the second invocation, which runs command after connecting to the device. 
+ 
+diff -Nurwd orig/lustre-1.8.2/lustre/doc/lustre.7 lustre-1.8.2/lustre/doc/lustre.7
+--- orig/lustre-1.8.2/lustre/doc/lustre.7	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/doc/lustre.7	2010-03-03 15:57:14.891633684 +0000
+@@ -2,13 +2,13 @@
+ .\" Copyright 2008 by Sun Microsystems, Inc.  All Rights Reserved.
+ .\" This file may be copied under the terms of the GNU Public License.
+ .\"
+-.TH Lustre 7 "2006 Jun 15" Lustre "A high-performance cluster file system"
++.TH Lustre 7
+ .SH NAME
+-Lustre
++Lustre - a high-performance cluster file system
+ .SH SYNOPSIS
+ A high-performance file system designed for clusters.
+ .SH DESCRIPTION
+-.B Lustre®
++.B Lustre\[rg]
+ is a high-performance, massively-scalable, POSIX-compliant network file system
+ designed for the world's largest high-performance compute clusters. Lustre
+ is under active development from Sun Microsystems (http://www.lustre.org).
+diff -Nurwd orig/lustre-1.8.2/lustre/doc/tex2pdf lustre-1.8.2/lustre/doc/tex2pdf
+--- orig/lustre-1.8.2/lustre/doc/tex2pdf	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/doc/tex2pdf	2010-03-03 15:57:14.863633966 +0000
+@@ -61,9 +61,8 @@
+ my $MYHOSTNAME=hostname;
+ my $MYNAME=basename $0;
+ my $MYUSER=$ENV{'USER'};
+-my $USER_HOME=$ENV{'HOME'};
+ if (not $MYUSER) { $MYUSER = 'nobody'; }
+-if (not $USER_HOME) { $USER_HOME = '/tmp'; }
++my $USER_HOME = $ENV{'PWD'}; 
+ 
+ my @TMPFILES=();
+ my @TMP_TEX_FILES=(); 
+@@ -1128,8 +1127,8 @@
+          &abort("Illegal value: $value");
+       }
+       &set_param_value($key, $value);
+-   } elsif (defined(&type_enum_array($type))){
+-      &set_enum_param($key, $value);
++#   } elsif (defined(&type_enum_array($type))){
++#      &set_enum_param($key, $value);
+    } else {
+       &set_param_value($key, $value);
+    }
+diff -Nurwd orig/lustre-1.8.2/lustre/include/Makefile.in lustre-1.8.2/lustre/include/Makefile.in
+--- orig/lustre-1.8.2/lustre/include/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/include/Makefile.in	2010-03-03 16:00:12.715633586 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83482,7 +85045,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/linux/Makefile.in lustre-1.8.1/lust
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83491,7 +85054,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/linux/Makefile.in lustre-1.8.1/lust
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83502,7 +85065,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/linux/Makefile.in lustre-1.8.1/lust
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83533,9 +85096,20 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/linux/Makefile.in lustre-1.8.1/lust
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/include/lustre/Makefile.in lustre-1.8.1/lustre/include/lustre/Makefile.in
---- lustre-1.8.1.orig/lustre/include/lustre/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/include/lustre/Makefile.in	2009-09-10 11:17:01.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/include/liblustre.h lustre-1.8.2/lustre/include/liblustre.h
+--- orig/lustre-1.8.2/lustre/include/liblustre.h	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/include/liblustre.h	2010-03-03 15:57:14.887656712 +0000
+@@ -67,6 +67,7 @@
+ #ifndef _IOWR
+ # include "ioctl.h"
+ #endif
++#include <sys/quota.h>
+ 
+ #include <stdio.h>
+ #include <sys/ioctl.h>
+diff -Nurwd orig/lustre-1.8.2/lustre/include/linux/Makefile.in lustre-1.8.2/lustre/include/linux/Makefile.in
+--- orig/lustre-1.8.2/lustre/include/linux/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/include/linux/Makefile.in	2010-03-03 16:00:12.771632818 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83550,7 +85124,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/lustre/Makefile.in lustre-1.8.1/lus
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83559,7 +85133,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/lustre/Makefile.in lustre-1.8.1/lus
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83570,7 +85144,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/lustre/Makefile.in lustre-1.8.1/lus
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83601,9 +85175,21 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/lustre/Makefile.in lustre-1.8.1/lus
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/include/Makefile.in lustre-1.8.1/lustre/include/Makefile.in
---- lustre-1.8.1.orig/lustre/include/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/include/Makefile.in	2009-09-10 11:17:01.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/include/linux/lustre_compat25.h lustre-1.8.2/lustre/include/linux/lustre_compat25.h
+--- orig/lustre-1.8.2/lustre/include/linux/lustre_compat25.h	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/include/linux/lustre_compat25.h	2010-03-03 15:57:14.879657721 +0000
+@@ -106,7 +106,7 @@
+ #define TRYLOCK_INODE_MUTEX(inode) (!down_trylock(&(inode)->i_sem))
+ #endif /* HAVE_INODE_I_MUTEX */
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+ #define d_child d_u.d_child
+ #define d_rcu d_u.d_rcu
+ #endif
+diff -Nurwd orig/lustre-1.8.2/lustre/include/lustre/Makefile.in lustre-1.8.2/lustre/include/lustre/Makefile.in
+--- orig/lustre-1.8.2/lustre/include/lustre/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/include/lustre/Makefile.in	2010-03-03 16:00:12.823633425 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83618,7 +85204,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/Makefile.in lustre-1.8.1/lustre/inc
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83627,7 +85213,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/Makefile.in lustre-1.8.1/lustre/inc
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83638,7 +85224,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/Makefile.in lustre-1.8.1/lustre/inc
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83669,9 +85255,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/include/Makefile.in lustre-1.8.1/lustre/inc
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/ldlm/Makefile.in lustre-1.8.1/lustre/ldlm/Makefile.in
---- lustre-1.8.1.orig/lustre/ldlm/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/ldlm/Makefile.in	2009-09-10 11:17:01.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/ldlm/Makefile.in lustre-1.8.2/lustre/ldlm/Makefile.in
+--- orig/lustre-1.8.2/lustre/ldlm/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/ldlm/Makefile.in	2010-03-03 16:00:12.871633869 +0000
 @@ -159,12 +159,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83686,7 +85272,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ldlm/Makefile.in lustre-1.8.1/lustre/ldlm/M
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -277,8 +276,6 @@
+@@ -281,8 +280,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83695,7 +85281,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ldlm/Makefile.in lustre-1.8.1/lustre/ldlm/M
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -292,8 +289,10 @@
+@@ -296,8 +293,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83706,7 +85292,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ldlm/Makefile.in lustre-1.8.1/lustre/ldlm/M
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -301,26 +300,27 @@
+@@ -305,26 +304,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83737,9 +85323,21 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ldlm/Makefile.in lustre-1.8.1/lustre/ldlm/M
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/Makefile.in lustre-1.8.1/lustre/liblustre/Makefile.in
---- lustre-1.8.1.orig/lustre/liblustre/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/liblustre/Makefile.in	2009-09-10 11:17:01.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/liblustre/Makefile.am lustre-1.8.2/lustre/liblustre/Makefile.am
+--- orig/lustre-1.8.2/lustre/liblustre/Makefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/liblustre/Makefile.am	2010-03-03 15:57:14.831634438 +0000
+@@ -1,7 +1,7 @@
+ ## Liblustre excecutables & libraries Makefile
+ SUBDIRS = . tests
+ 
+-AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 \
++AM_CPPFLAGS = $(HAVE_EFENCE) -I$(top_srcdir)/libsysio/include -D_LARGEFILE64_SOURCE=1 \
+               $(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
+ AM_CFLAGS = $(LLCFLAGS)
+ 
+diff -Nurwd orig/lustre-1.8.2/lustre/liblustre/Makefile.in lustre-1.8.2/lustre/liblustre/Makefile.in
+--- orig/lustre-1.8.2/lustre/liblustre/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/liblustre/Makefile.in	2010-03-03 16:00:12.951634326 +0000
 @@ -121,12 +121,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83754,7 +85352,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/Makefile.in lustre-1.8.1/lustre/l
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -238,8 +237,6 @@
+@@ -242,8 +241,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83763,7 +85361,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/Makefile.in lustre-1.8.1/lustre/l
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -253,8 +250,10 @@
+@@ -257,8 +254,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83774,7 +85372,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/Makefile.in lustre-1.8.1/lustre/l
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -262,26 +261,27 @@
+@@ -266,26 +265,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83805,7 +85403,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/Makefile.in lustre-1.8.1/lustre/l
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -295,7 +295,7 @@
+@@ -298,7 +298,7 @@
  target_vendor = @target_vendor@
  SUBDIRS = . tests
  
@@ -83814,9 +85412,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/Makefile.in lustre-1.8.1/lustre/l
                $(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
  
  AM_CFLAGS = $(LLCFLAGS)
-diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/tests/Makefile.in lustre-1.8.1/lustre/liblustre/tests/Makefile.in
---- lustre-1.8.1.orig/lustre/liblustre/tests/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/liblustre/tests/Makefile.in	2009-09-10 11:17:02.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/liblustre/tests/Makefile.in lustre-1.8.2/lustre/liblustre/tests/Makefile.in
+--- orig/lustre-1.8.2/lustre/liblustre/tests/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/liblustre/tests/Makefile.in	2010-03-03 16:00:13.063633397 +0000
 @@ -120,12 +120,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83831,7 +85429,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/tests/Makefile.in lustre-1.8.1/lu
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -237,8 +236,6 @@
+@@ -241,8 +240,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83840,7 +85438,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/tests/Makefile.in lustre-1.8.1/lu
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -252,8 +249,10 @@
+@@ -256,8 +253,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83851,7 +85449,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/tests/Makefile.in lustre-1.8.1/lu
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -261,26 +260,27 @@
+@@ -265,26 +264,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83882,9 +85480,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/tests/Makefile.in lustre-1.8.1/lu
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/tests/mpi/Makefile.in lustre-1.8.1/lustre/liblustre/tests/mpi/Makefile.in
---- lustre-1.8.1.orig/lustre/liblustre/tests/mpi/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/liblustre/tests/mpi/Makefile.in	2009-09-10 11:17:02.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/liblustre/tests/mpi/Makefile.in lustre-1.8.2/lustre/liblustre/tests/mpi/Makefile.in
+--- orig/lustre-1.8.2/lustre/liblustre/tests/mpi/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/liblustre/tests/mpi/Makefile.in	2010-03-03 16:00:13.131632824 +0000
 @@ -120,12 +120,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83899,7 +85497,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/tests/mpi/Makefile.in lustre-1.8.
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -237,8 +236,6 @@
+@@ -241,8 +240,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83908,7 +85506,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/tests/mpi/Makefile.in lustre-1.8.
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -252,8 +249,10 @@
+@@ -256,8 +253,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83919,7 +85517,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/tests/mpi/Makefile.in lustre-1.8.
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -261,26 +260,27 @@
+@@ -265,26 +264,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83950,9 +85548,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/liblustre/tests/mpi/Makefile.in lustre-1.8.
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/llite/autoMakefile.in lustre-1.8.1/lustre/llite/autoMakefile.in
---- lustre-1.8.1.orig/lustre/llite/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/llite/autoMakefile.in	2009-09-10 11:17:02.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/llite/autoMakefile.in lustre-1.8.2/lustre/llite/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/llite/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/llite/autoMakefile.in	2010-03-03 16:00:13.179633759 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -83967,7 +85565,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/llite/autoMakefile.in lustre-1.8.1/lustre/l
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -83976,7 +85574,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/llite/autoMakefile.in lustre-1.8.1/lustre/l
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83987,7 +85585,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/llite/autoMakefile.in lustre-1.8.1/lustre/l
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84018,9 +85616,93 @@ diff -Nurwd lustre-1.8.1.orig/lustre/llite/autoMakefile.in lustre-1.8.1/lustre/l
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov/autoMakefile.in
---- lustre-1.8.1.orig/lustre/lov/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/lov/autoMakefile.in	2009-09-10 11:17:02.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/llite/file.c lustre-1.8.2/lustre/llite/file.c
+--- orig/lustre-1.8.2/lustre/llite/file.c	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/llite/file.c	2010-03-03 15:57:14.839642509 +0000
+@@ -45,6 +45,7 @@
+ #include <lustre_lite.h>
+ #include <linux/pagemap.h>
+ #include <linux/file.h>
++#include <linux/posix_acl.h>
+ #include "llite_internal.h"
+ #include <lustre/ll_fiemap.h>
+ 
+@@ -276,6 +277,10 @@
+                 lov_test_and_clear_async_rc(lsm);
+         lli->lli_async_rc = 0;
+ 
++        /* Ensure that dirty pages are flushed out with the right creds */
++        if (file->f_mode & FMODE_WRITE)
++                filemap_fdatawrite(file->f_mapping);
++
+         rc = ll_mdc_close(sbi->ll_mdc_exp, inode, file);
+ 
+         if (OBD_FAIL_TIMEOUT_MS(OBD_FAIL_PTLRPC_DUMP_LOG, obd_fail_val))
+diff -Nurwd orig/lustre-1.8.2/lustre/llite/xattr.c lustre-1.8.2/lustre/llite/xattr.c
+--- orig/lustre-1.8.2/lustre/llite/xattr.c	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/llite/xattr.c	2010-03-03 15:57:14.791661479 +0000
+@@ -38,6 +38,7 @@
+ #include <linux/sched.h>
+ #include <linux/mm.h>
+ #include <linux/smp_lock.h>
++#include <linux/posix_acl_xattr.h>
+ 
+ #define DEBUG_SUBSYSTEM S_LLITE
+ 
+diff -Nurwd orig/lustre-1.8.2/lustre/lov/autoMakefile.am lustre-1.8.2/lustre/lov/autoMakefile.am
+--- orig/lustre-1.8.2/lustre/lov/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/lov/autoMakefile.am	2010-03-03 15:57:14.827661168 +0000
+@@ -46,29 +46,29 @@
+ modulefs_DATA = lov$(KMODEXT)
+ endif
+ 
+-if DARWIN
+-macos_PROGRAMS := lov
++#if DARWIN
++#macos_PROGRAMS := lov
+ 
+-lov_SOURCES :=          \
+-        lov_log.c       \
+-	lov_pool.c	\
+-        lov_obd.c       \
+-        lov_pack.c      \
+-        lov_request.c   \
+-        lov_merge.c     \
+-        lov_qos.c       \
+-        lov_offset.c    \
+-        lov_internal.h
++#lov_SOURCES :=          \
++#        lov_log.c       \
++#	lov_pool.c	\
++#        lov_obd.c       \
++#        lov_pack.c      \
++#        lov_request.c   \
++#        lov_merge.c     \
++#        lov_qos.c       \
++#        lov_offset.c    \
++#        lov_internal.h
+ 
+-lov_CFLAGS := $(EXTRA_KCFLAGS)
+-lov_LDFLAGS := $(EXTRA_KLDFLAGS)
+-lov_LDADD := $(EXTRA_KLIBS)
++#lov_CFLAGS := $(EXTRA_KCFLAGS)
++#lov_LDFLAGS := $(EXTRA_KLDFLAGS)
++#lov_LDADD := $(EXTRA_KLIBS)
+ 
+-plist_DATA := Info.plist
++#plist_DATA := Info.plist
+ 
+-install_data_hook := fix-kext-ownership
++#install_data_hook := fix-kext-ownership
+ 
+-endif # DARWIN
++#endif # DARWIN
+ 
+ endif # MODULES
+ 
+diff -Nurwd orig/lustre-1.8.2/lustre/lov/autoMakefile.in lustre-1.8.2/lustre/lov/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/lov/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/lov/autoMakefile.in	2010-03-03 16:00:13.287633596 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -84035,7 +85717,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -84044,7 +85726,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84055,7 +85737,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84086,7 +85768,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -335,28 +335,6 @@
+@@ -338,28 +338,6 @@
  @LIBLUSTRE_TRUE at liblov_a_CFLAGS = $(LLCFLAGS)
  
  @LINUX_TRUE@@MODULES_TRUE at modulefs_DATA = lov$(KMODEXT)
@@ -84115,7 +85797,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  subdir = lustre/lov
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -379,27 +357,6 @@
+@@ -382,27 +360,6 @@
  @LIBLUSTRE_TRUE@	liblov_a-lov_merge.$(OBJEXT) \
  @LIBLUSTRE_TRUE@	liblov_a-lov_ea.$(OBJEXT)
  liblov_a_OBJECTS = $(am_liblov_a_OBJECTS)
@@ -84143,7 +85825,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -412,24 +369,16 @@
+@@ -415,24 +372,16 @@
  @AMDEP_TRUE@	./$(DEPDIR)/liblov_a-lov_pack.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/liblov_a-lov_pool.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/liblov_a-lov_qos.Po \
@@ -84172,7 +85854,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  
  all: all-am
  
-@@ -451,33 +400,6 @@
+@@ -454,33 +403,6 @@
  	-rm -f liblov.a
  	$(liblov_a_AR) liblov.a $(liblov_a_OBJECTS) $(liblov_a_LIBADD)
  	$(RANLIB) liblov.a
@@ -84206,7 +85888,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT) core *.core
-@@ -494,14 +416,6 @@
+@@ -497,14 +419,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblov_a-lov_pool.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblov_a-lov_qos.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblov_a-lov_request.Po at am__quote@
@@ -84221,7 +85903,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  
  .c.o:
  @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@@ -722,182 +636,6 @@
+@@ -725,182 +639,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblov_a-lov_ea.Po' tmpdepfile='$(DEPDIR)/liblov_a-lov_ea.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblov_a_CPPFLAGS) $(CPPFLAGS) $(liblov_a_CFLAGS) $(CFLAGS) -c -o liblov_a-lov_ea.obj `if test -f 'lov_ea.c'; then $(CYGPATH_W) 'lov_ea.c'; else $(CYGPATH_W) '$(srcdir)/lov_ea.c'; fi`
@@ -84404,7 +86086,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  uninstall-info-am:
  modulefsDATA_INSTALL = $(INSTALL_DATA)
  install-modulefsDATA: $(modulefs_DATA)
-@@ -917,24 +655,6 @@
+@@ -920,24 +658,6 @@
  	  echo " rm -f $(DESTDIR)$(modulefsdir)/$$f"; \
  	  rm -f $(DESTDIR)$(modulefsdir)/$$f; \
  	done
@@ -84429,7 +86111,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  
  ETAGS = etags
  ETAGSFLAGS =
-@@ -1023,10 +743,10 @@
+@@ -1026,10 +746,10 @@
  	done
  check-am: all-am
  check: check-am
@@ -84442,7 +86124,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -1054,8 +774,7 @@
+@@ -1057,8 +777,7 @@
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
@@ -84452,7 +86134,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  
  distclean: distclean-am
  	-rm -rf ./$(DEPDIR)
-@@ -1071,8 +790,7 @@
+@@ -1074,8 +793,7 @@
  
  info-am:
  
@@ -84462,7 +86144,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
  
-@@ -1101,22 +819,43 @@
+@@ -1104,22 +822,43 @@
  
  ps-am:
  
@@ -84517,9 +86199,49 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lov/autoMakefile.in lustre-1.8.1/lustre/lov
  
  install-data-hook: $(install_data_hook)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lvfs/autoMakefile.in
---- lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/lvfs/autoMakefile.in	2009-09-10 11:17:02.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/lvfs/autoMakefile.am lustre-1.8.2/lustre/lvfs/autoMakefile.am
+--- orig/lustre-1.8.2/lustre/lvfs/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/lvfs/autoMakefile.am	2010-03-03 15:57:14.827661168 +0000
+@@ -85,21 +85,21 @@
+ 
+ endif # LINUX
+ 
+-if DARWIN
+-
+-macos_PROGRAMS := lvfs
+-
+-lvfs_SOURCES := lvfs_darwin.c
+-
+-lvfs_CFLAGS := $(EXTRA_KCFLAGS)
+-lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
+-lvfs_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#if DARWIN
++#
++#macos_PROGRAMS := lvfs
++#
++#lvfs_SOURCES := lvfs_darwin.c
++#
++#lvfs_CFLAGS := $(EXTRA_KCFLAGS)
++#lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
++#lvfs_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+ 
+ else # MODULES
+ 
+diff -Nurwd orig/lustre-1.8.2/lustre/lvfs/autoMakefile.in lustre-1.8.2/lustre/lvfs/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/lvfs/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/lvfs/autoMakefile.in	2010-03-03 16:00:13.384632658 +0000
 @@ -156,12 +156,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -84534,7 +86256,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -274,8 +273,6 @@
+@@ -278,8 +277,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -84543,7 +86265,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -289,8 +286,10 @@
+@@ -293,8 +290,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84554,7 +86276,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -298,26 +297,27 @@
+@@ -302,26 +301,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84585,7 +86307,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -351,18 +351,6 @@
+@@ -354,18 +354,6 @@
  @LINUX_TRUE@@MODULES_TRUE@	-e "s/EXT4/LDISKFS/g" -e "s/ext4/ldiskfs/g" \
  @LINUX_TRUE@@MODULES_TRUE@	-e "s/HAVE_LDISKFS_LDISKFS/HAVE_EXT4_LDISKFS/g"
  
@@ -84604,7 +86326,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  CLEANFILES = fsfilt-*.c fsfilt_ldiskfs*.c fsfilt_extN.c sources
  subdir = lustre/lvfs
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -378,36 +366,22 @@
+@@ -381,36 +369,22 @@
  @LIBLUSTRE_TRUE@	liblvfs_a-prng.$(OBJEXT) \
  @LIBLUSTRE_TRUE@	liblvfs_a-lvfs_lib.$(OBJEXT)
  liblvfs_a_OBJECTS = $(am_liblvfs_a_OBJECTS)
@@ -84645,7 +86367,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  
  all: all-am
  
-@@ -429,33 +403,6 @@
+@@ -432,33 +406,6 @@
  	-rm -f liblvfs.a
  	$(liblvfs_a_AR) liblvfs.a $(liblvfs_a_OBJECTS) $(liblvfs_a_LIBADD)
  	$(RANLIB) liblvfs.a
@@ -84679,7 +86401,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT) core *.core
-@@ -466,7 +413,6 @@
+@@ -469,7 +416,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblvfs_a-lvfs_lib.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblvfs_a-lvfs_userfs.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblvfs_a-prng.Po at am__quote@
@@ -84687,7 +86409,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  
  .c.o:
  @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@@ -555,28 +501,6 @@
+@@ -558,28 +504,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblvfs_a-lvfs_lib.Po' tmpdepfile='$(DEPDIR)/liblvfs_a-lvfs_lib.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblvfs_a_CPPFLAGS) $(CPPFLAGS) $(liblvfs_a_CFLAGS) $(CFLAGS) -c -o liblvfs_a-lvfs_lib.obj `if test -f 'lvfs_lib.c'; then $(CYGPATH_W) 'lvfs_lib.c'; else $(CYGPATH_W) '$(srcdir)/lvfs_lib.c'; fi`
@@ -84716,7 +86438,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  uninstall-info-am:
  modulefsDATA_INSTALL = $(INSTALL_DATA)
  install-modulefsDATA: $(modulefs_DATA)
-@@ -596,24 +520,6 @@
+@@ -599,24 +523,6 @@
  	  echo " rm -f $(DESTDIR)$(modulefsdir)/$$f"; \
  	  rm -f $(DESTDIR)$(modulefsdir)/$$f; \
  	done
@@ -84741,7 +86463,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  
  ETAGS = etags
  ETAGSFLAGS =
-@@ -702,10 +608,10 @@
+@@ -705,10 +611,10 @@
  	done
  check-am: all-am
  check: check-am
@@ -84754,7 +86476,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -734,8 +640,7 @@
+@@ -737,8 +643,7 @@
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
@@ -84764,7 +86486,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  
  distclean: distclean-am
  	-rm -rf ./$(DEPDIR)
-@@ -751,8 +656,7 @@
+@@ -754,8 +659,7 @@
  
  info-am:
  
@@ -84774,7 +86496,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
  
-@@ -781,21 +685,18 @@
+@@ -784,21 +688,18 @@
  
  ps-am:
  
@@ -84804,7 +86526,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  
  
  @LINUX_TRUE@@MODULES_TRUE@@SERVER_TRUE at sources: fsfilt_$(BACKINGFS).c
-@@ -814,6 +715,22 @@
+@@ -817,6 +718,22 @@
  @LINUX_TRUE@@MODULES_TRUE at fsfilt_ldiskfs_quota.h: fsfilt_ext3_quota.h
  @LINUX_TRUE@@MODULES_TRUE@	sed $(strip $(ldiskfs_sed_flags)) $< > $@
  
@@ -84827,9 +86549,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/lvfs/autoMakefile.in lustre-1.8.1/lustre/lv
  @MODULES_FALSE at sources:
  
  install-data-hook: $(install_data_hook)
-diff -Nurwd lustre-1.8.1.orig/lustre/mdc/autoMakefile.in lustre-1.8.1/lustre/mdc/autoMakefile.in
---- lustre-1.8.1.orig/lustre/mdc/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/mdc/autoMakefile.in	2009-09-10 11:17:03.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/mdc/autoMakefile.in lustre-1.8.2/lustre/mdc/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/mdc/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/mdc/autoMakefile.in	2010-03-03 16:00:13.488633646 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -84844,7 +86566,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mdc/autoMakefile.in lustre-1.8.1/lustre/mdc
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -84853,7 +86575,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mdc/autoMakefile.in lustre-1.8.1/lustre/mdc
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84864,7 +86586,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mdc/autoMakefile.in lustre-1.8.1/lustre/mdc
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84895,9 +86617,31 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mdc/autoMakefile.in lustre-1.8.1/lustre/mdc
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/mds/autoMakefile.in lustre-1.8.1/lustre/mds/autoMakefile.in
---- lustre-1.8.1.orig/lustre/mds/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/mds/autoMakefile.in	2009-09-10 11:17:03.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/mdc/mdc_locks.c lustre-1.8.2/lustre/mdc/mdc_locks.c
+--- orig/lustre-1.8.2/lustre/mdc/mdc_locks.c	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/mdc/mdc_locks.c	2010-03-03 15:57:14.791661479 +0000
+@@ -44,6 +44,7 @@
+ # include <linux/pagemap.h>
+ # include <linux/miscdevice.h>
+ # include <linux/init.h>
++# include <linux/posix_acl_xattr.h>
+ #else
+ # include <liblustre.h>
+ #endif
+diff -Nurwd orig/lustre-1.8.2/lustre/mdc/mdc_request.c lustre-1.8.2/lustre/mdc/mdc_request.c
+--- orig/lustre-1.8.2/lustre/mdc/mdc_request.c	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/mdc/mdc_request.c	2010-03-03 15:57:14.791661479 +0000
+@@ -44,6 +44,7 @@
+ # include <linux/pagemap.h>
+ # include <linux/miscdevice.h>
+ # include <linux/init.h>
++# include <linux/posix_acl_xattr.h>
+ #else
+ # include <liblustre.h>
+ #endif
+diff -Nurwd orig/lustre-1.8.2/lustre/mds/autoMakefile.in lustre-1.8.2/lustre/mds/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/mds/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/mds/autoMakefile.in	2010-03-03 16:00:13.548633586 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -84912,7 +86656,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mds/autoMakefile.in lustre-1.8.1/lustre/mds
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -84921,7 +86665,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mds/autoMakefile.in lustre-1.8.1/lustre/mds
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84932,7 +86676,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mds/autoMakefile.in lustre-1.8.1/lustre/mds
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84963,9 +86707,51 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mds/autoMakefile.in lustre-1.8.1/lustre/mds
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/mgc/autoMakefile.in lustre-1.8.1/lustre/mgc/autoMakefile.in
---- lustre-1.8.1.orig/lustre/mgc/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/mgc/autoMakefile.in	2009-09-10 11:17:03.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/mds/handler.c lustre-1.8.2/lustre/mds/handler.c
+--- orig/lustre-1.8.2/lustre/mds/handler.c	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/mds/handler.c	2010-03-03 15:57:14.795654724 +0000
+@@ -52,6 +52,7 @@
+ #include <linux/random.h>
+ #include <linux/fs.h>
+ #include <linux/jbd.h>
++#include <linux/posix_acl_xattr.h>
+ # include <linux/smp_lock.h>
+ # include <linux/buffer_head.h>
+ # include <linux/workqueue.h>
+@@ -1206,6 +1207,7 @@
+         struct lvfs_run_ctxt saved;
+         int rc, size[2] = { sizeof(struct ptlrpc_body), sizeof(*repbody) };
+         struct lvfs_ucred uc = {NULL,};
++        int blksize;
+         ENTRY;
+ 
+         OBD_FAIL_RETURN(OBD_FAIL_MDS_READPAGE_PACK, -ENOMEM);
+@@ -1234,17 +1236,18 @@
+         if (IS_ERR(file))
+                 GOTO(out_pop, rc = PTR_ERR(file));
+ 
++        blksize = de->d_inode->i_sb->s_blocksize;
+         /* body->size is actually the offset -eeb */
+-        if ((body->size & (de->d_inode->i_sb->s_blocksize - 1)) != 0) {
++        if ((body->size & (blksize - 1)) != 0) {
+                 CERROR("offset "LPU64" not on a block boundary of %lu\n",
+-                       body->size, de->d_inode->i_sb->s_blocksize);
++                       body->size, blksize);
+                 GOTO(out_file, rc = -EFAULT);
+         }
+ 
+         /* body->nlink is actually the #bytes to read -eeb */
+-        if (body->nlink & (de->d_inode->i_sb->s_blocksize - 1)) {
++        if (body->nlink & (blksize - 1)) {
+                 CERROR("size %u is not multiple of blocksize %lu\n",
+-                       body->nlink, de->d_inode->i_sb->s_blocksize);
++                       body->nlink, blksize);
+                 GOTO(out_file, rc = -EFAULT);
+         }
+ 
+diff -Nurwd orig/lustre-1.8.2/lustre/mgc/autoMakefile.in lustre-1.8.2/lustre/mgc/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/mgc/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/mgc/autoMakefile.in	2010-03-03 16:00:13.623632925 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -84980,7 +86766,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mgc/autoMakefile.in lustre-1.8.1/lustre/mgc
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -84989,7 +86775,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mgc/autoMakefile.in lustre-1.8.1/lustre/mgc
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85000,7 +86786,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mgc/autoMakefile.in lustre-1.8.1/lustre/mgc
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85031,9 +86817,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mgc/autoMakefile.in lustre-1.8.1/lustre/mgc
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/mgs/autoMakefile.in lustre-1.8.1/lustre/mgs/autoMakefile.in
---- lustre-1.8.1.orig/lustre/mgs/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/mgs/autoMakefile.in	2009-09-10 11:17:03.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/mgs/autoMakefile.in lustre-1.8.2/lustre/mgs/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/mgs/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/mgs/autoMakefile.in	2010-03-03 16:00:13.675633530 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -85048,7 +86834,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mgs/autoMakefile.in lustre-1.8.1/lustre/mgs
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -85057,7 +86843,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mgs/autoMakefile.in lustre-1.8.1/lustre/mgs
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85068,7 +86854,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mgs/autoMakefile.in lustre-1.8.1/lustre/mgs
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85099,9 +86885,68 @@ diff -Nurwd lustre-1.8.1.orig/lustre/mgs/autoMakefile.in lustre-1.8.1/lustre/mgs
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustre/obdclass/autoMakefile.in
---- lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/obdclass/autoMakefile.in	2009-09-10 11:17:03.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/obdclass/autoMakefile.am lustre-1.8.2/lustre/obdclass/autoMakefile.am
+--- orig/lustre-1.8.2/lustre/obdclass/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/obdclass/autoMakefile.am	2010-03-03 15:57:14.827661168 +0000
+@@ -1,7 +1,7 @@
+ SUBDIRS := linux
+-if DARWIN
+-SUBDIRS += darwin
+-endif
++#if DARWIN
++#SUBDIRS += darwin
++#endif
+ DIST_SUBDIRS := $(SUBDIRS)
+ 
+ if LIBLUSTRE
+@@ -25,25 +25,25 @@
+ noinst_DATA = llog_test$(KMODEXT)
+ endif # LINUX
+ 
+-if DARWIN
+-macos_PROGRAMS := obdclass
+-
+-obdclass_SOURCES := \
+-        darwin/darwin-module.c darwin/darwin-sysctl.c 		\
+-        class_obd.c genops.c lprocfs_status.c           	\
+-        lustre_handles.c lustre_peer.c obd_config.c     	\
+-        obdo.c debug.c llog_ioctl.c uuid.c                      \
+-        llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c
+-
+-obdclass_CFLAGS := $(EXTRA_KCFLAGS)
+-obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
+-obdclass_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#if DARWIN
++#macos_PROGRAMS := obdclass
++#
++#obdclass_SOURCES := \
++#        darwin/darwin-module.c darwin/darwin-sysctl.c 		\
++#        class_obd.c genops.c lprocfs_status.c           	\
++#        lustre_handles.c lustre_peer.c obd_config.c     	\
++#        obdo.c debug.c llog_ioctl.c uuid.c                      \
++#        llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c
++#
++#obdclass_CFLAGS := $(EXTRA_KCFLAGS)
++#obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
++#obdclass_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+ 
+ endif # MODULES
+ 
+diff -Nurwd orig/lustre-1.8.2/lustre/obdclass/autoMakefile.in lustre-1.8.2/lustre/obdclass/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/obdclass/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/obdclass/autoMakefile.in	2010-03-03 16:00:13.807632857 +0000
 @@ -38,7 +38,6 @@
  build_triplet = @build@
  host_triplet = @host@
@@ -85124,7 +86969,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -238,8 +236,6 @@
+@@ -242,8 +240,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -85133,7 +86978,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -253,8 +249,10 @@
+@@ -257,8 +253,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85144,7 +86989,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -262,26 +260,27 @@
+@@ -266,26 +264,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85175,7 +87020,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -293,7 +292,10 @@
+@@ -296,7 +295,10 @@
  target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
@@ -85187,7 +87032,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  DIST_SUBDIRS := $(SUBDIRS)
  
  @LIBLUSTRE_TRUE at noinst_LIBRARIES = liblustreclass.a
-@@ -303,24 +305,6 @@
+@@ -306,24 +308,6 @@
  
  @LINUX_TRUE@@MODULES_TRUE at modulefs_DATA = obdclass$(KMODEXT)
  @LINUX_TRUE@@MODULES_TRUE at noinst_DATA = llog_test$(KMODEXT)
@@ -85212,7 +87057,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  subdir = lustre/obdclass
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -352,40 +336,6 @@
+@@ -355,40 +339,6 @@
  @LIBLUSTRE_TRUE@	liblustreclass_a-llog_lvfs.$(OBJEXT) \
  @LIBLUSTRE_TRUE@	liblustreclass_a-llog_swab.$(OBJEXT)
  liblustreclass_a_OBJECTS = $(am_liblustreclass_a_OBJECTS)
@@ -85253,7 +87098,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -405,31 +355,13 @@
+@@ -408,31 +358,13 @@
  @AMDEP_TRUE@	./$(DEPDIR)/liblustreclass_a-obd_config.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/liblustreclass_a-obdo.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/liblustreclass_a-statfs_pack.Po \
@@ -85288,7 +87133,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  
  
  RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-@@ -438,7 +370,7 @@
+@@ -441,7 +373,7 @@
  	installdirs-recursive install-recursive uninstall-recursive \
  	check-recursive installcheck-recursive
  DIST_COMMON = $(srcdir)/autoMakefile.in Makefile.in autoMakefile.am
@@ -85297,7 +87142,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  
  all: all-recursive
  
-@@ -460,33 +392,6 @@
+@@ -463,33 +395,6 @@
  	-rm -f liblustreclass.a
  	$(liblustreclass_a_AR) liblustreclass.a $(liblustreclass_a_OBJECTS) $(liblustreclass_a_LIBADD)
  	$(RANLIB) liblustreclass.a
@@ -85331,7 +87176,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT) core *.core
-@@ -510,23 +415,6 @@
+@@ -513,23 +418,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblustreclass_a-obdo.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblustreclass_a-statfs_pack.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblustreclass_a-uuid.Po at am__quote@
@@ -85355,7 +87200,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  
  .c.o:
  @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@@ -901,380 +789,6 @@
+@@ -904,380 +792,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblustreclass_a-llog_swab.Po' tmpdepfile='$(DEPDIR)/liblustreclass_a-llog_swab.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblustreclass_a_CPPFLAGS) $(CPPFLAGS) $(liblustreclass_a_CFLAGS) $(CFLAGS) -c -o liblustreclass_a-llog_swab.obj `if test -f 'llog_swab.c'; then $(CYGPATH_W) 'llog_swab.c'; else $(CYGPATH_W) '$(srcdir)/llog_swab.c'; fi`
@@ -85736,7 +87581,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  uninstall-info-am:
  modulefsDATA_INSTALL = $(INSTALL_DATA)
  install-modulefsDATA: $(modulefs_DATA)
-@@ -1294,24 +808,6 @@
+@@ -1297,24 +811,6 @@
  	  echo " rm -f $(DESTDIR)$(modulefsdir)/$$f"; \
  	  rm -f $(DESTDIR)$(modulefsdir)/$$f; \
  	done
@@ -85761,7 +87606,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -1483,10 +979,10 @@
+@@ -1486,10 +982,10 @@
  	done
  check-am: all-am
  check: check-recursive
@@ -85774,7 +87619,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  
  install: install-recursive
  install-exec: install-exec-recursive
-@@ -1515,8 +1011,7 @@
+@@ -1518,8 +1014,7 @@
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-recursive
  
@@ -85784,7 +87629,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  
  distclean: distclean-recursive
  	-rm -rf ./$(DEPDIR)
-@@ -1532,8 +1027,7 @@
+@@ -1535,8 +1030,7 @@
  
  info-am:
  
@@ -85794,7 +87639,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
  
-@@ -1562,31 +1056,49 @@
+@@ -1565,31 +1059,49 @@
  
  ps-am:
  
@@ -85863,9 +87708,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/autoMakefile.in lustre-1.8.1/lustr
  install-data-hook: $(install_data_hook)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/linux/Makefile.in lustre-1.8.1/lustre/obdclass/linux/Makefile.in
---- lustre-1.8.1.orig/lustre/obdclass/linux/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/obdclass/linux/Makefile.in	2009-09-10 11:17:04.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/obdclass/linux/Makefile.in lustre-1.8.2/lustre/obdclass/linux/Makefile.in
+--- orig/lustre-1.8.2/lustre/obdclass/linux/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/obdclass/linux/Makefile.in	2010-03-03 16:00:13.855633512 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -85880,7 +87725,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/linux/Makefile.in lustre-1.8.1/lus
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -85889,7 +87734,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/linux/Makefile.in lustre-1.8.1/lus
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85900,7 +87745,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/linux/Makefile.in lustre-1.8.1/lus
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85931,9 +87776,51 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdclass/linux/Makefile.in lustre-1.8.1/lus
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre/obdecho/autoMakefile.in
---- lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/obdecho/autoMakefile.in	2009-09-10 11:17:04.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/obdecho/autoMakefile.am lustre-1.8.2/lustre/obdecho/autoMakefile.am
+--- orig/lustre-1.8.2/lustre/obdecho/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/obdecho/autoMakefile.am	2010-03-03 15:57:14.827661168 +0000
+@@ -46,22 +46,22 @@
+ modulefs_DATA = obdecho$(KMODEXT)
+ endif
+ 
+-if DARWIN
+-macos_PROGRAMS := obdecho
+-obdecho_SOURCES := \
+-        lproc_echo.c \
+-        echo.c \
+-        echo_client.c
+-
+-obdecho_CFLAGS := $(EXTRA_KCFLAGS)
+-obdecho_LDFLAGS := $(EXTRA_KLDFLAGS)
+-obdecho_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # darwin
++#if DARWIN
++#macos_PROGRAMS := obdecho
++#obdecho_SOURCES := \
++#        lproc_echo.c \
++#        echo.c \
++#        echo_client.c
++#
++#obdecho_CFLAGS := $(EXTRA_KCFLAGS)
++#obdecho_LDFLAGS := $(EXTRA_KLDFLAGS)
++#obdecho_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # darwin
+ 
+ endif # MODULES
+ 
+diff -Nurwd orig/lustre-1.8.2/lustre/obdecho/autoMakefile.in lustre-1.8.2/lustre/obdecho/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/obdecho/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/obdecho/autoMakefile.in	2010-03-03 16:00:13.927633651 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -85948,7 +87835,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -85957,7 +87844,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85968,7 +87855,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85999,7 +87886,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -335,21 +335,6 @@
+@@ -338,21 +338,6 @@
  @LIBLUSTRE_TRUE at libobdecho_a_CFLAGS = $(LLCFLAGS)
  
  @LINUX_TRUE@@MODULES_TRUE at modulefs_DATA = obdecho$(KMODEXT)
@@ -86021,7 +87908,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  subdir = lustre/obdecho
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -363,40 +348,20 @@
+@@ -366,40 +351,20 @@
  @LIBLUSTRE_TRUE at am_libobdecho_a_OBJECTS = \
  @LIBLUSTRE_TRUE@	libobdecho_a-echo_client.$(OBJEXT)
  libobdecho_a_OBJECTS = $(am_libobdecho_a_OBJECTS)
@@ -86066,7 +87953,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  
  all: all-am
  
-@@ -418,33 +383,6 @@
+@@ -421,33 +386,6 @@
  	-rm -f libobdecho.a
  	$(libobdecho_a_AR) libobdecho.a $(libobdecho_a_OBJECTS) $(libobdecho_a_LIBADD)
  	$(RANLIB) libobdecho.a
@@ -86100,7 +87987,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT) core *.core
-@@ -453,9 +391,6 @@
+@@ -456,9 +394,6 @@
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libobdecho_a-echo_client.Po at am__quote@
@@ -86110,7 +87997,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  
  .c.o:
  @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@@ -500,72 +435,6 @@
+@@ -503,72 +438,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libobdecho_a-echo_client.Po' tmpdepfile='$(DEPDIR)/libobdecho_a-echo_client.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libobdecho_a_CPPFLAGS) $(CPPFLAGS) $(libobdecho_a_CFLAGS) $(CFLAGS) -c -o libobdecho_a-echo_client.obj `if test -f 'echo_client.c'; then $(CYGPATH_W) 'echo_client.c'; else $(CYGPATH_W) '$(srcdir)/echo_client.c'; fi`
@@ -86183,7 +88070,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  uninstall-info-am:
  modulefsDATA_INSTALL = $(INSTALL_DATA)
  install-modulefsDATA: $(modulefs_DATA)
-@@ -585,24 +454,6 @@
+@@ -588,24 +457,6 @@
  	  echo " rm -f $(DESTDIR)$(modulefsdir)/$$f"; \
  	  rm -f $(DESTDIR)$(modulefsdir)/$$f; \
  	done
@@ -86208,7 +88095,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  
  ETAGS = etags
  ETAGSFLAGS =
-@@ -691,10 +542,10 @@
+@@ -694,10 +545,10 @@
  	done
  check-am: all-am
  check: check-am
@@ -86221,7 +88108,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -722,8 +573,7 @@
+@@ -725,8 +576,7 @@
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
@@ -86231,7 +88118,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  
  distclean: distclean-am
  	-rm -rf ./$(DEPDIR)
-@@ -739,8 +589,7 @@
+@@ -742,8 +592,7 @@
  
  info-am:
  
@@ -86241,7 +88128,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
  
-@@ -769,22 +618,36 @@
+@@ -772,22 +621,36 @@
  
  ps-am:
  
@@ -86289,9 +88176,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdecho/autoMakefile.in lustre-1.8.1/lustre
  
  install-data-hook: $(install_data_hook)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -Nurwd lustre-1.8.1.orig/lustre/obdfilter/autoMakefile.in lustre-1.8.1/lustre/obdfilter/autoMakefile.in
---- lustre-1.8.1.orig/lustre/obdfilter/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/obdfilter/autoMakefile.in	2009-09-10 11:17:04.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/obdfilter/autoMakefile.in lustre-1.8.2/lustre/obdfilter/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/obdfilter/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/obdfilter/autoMakefile.in	2010-03-03 16:00:13.979633412 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -86306,7 +88193,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdfilter/autoMakefile.in lustre-1.8.1/lust
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -86315,7 +88202,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdfilter/autoMakefile.in lustre-1.8.1/lust
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86326,7 +88213,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdfilter/autoMakefile.in lustre-1.8.1/lust
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86357,9 +88244,51 @@ diff -Nurwd lustre-1.8.1.orig/lustre/obdfilter/autoMakefile.in lustre-1.8.1/lust
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc/autoMakefile.in
---- lustre-1.8.1.orig/lustre/osc/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/osc/autoMakefile.in	2009-09-10 11:17:04.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/osc/autoMakefile.am lustre-1.8.2/lustre/osc/autoMakefile.am
+--- orig/lustre-1.8.2/lustre/osc/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/osc/autoMakefile.am	2010-03-03 15:57:14.827661168 +0000
+@@ -47,22 +47,22 @@
+ modulefs_DATA = osc$(KMODEXT)
+ endif
+ 
+-if DARWIN
+-macos_PROGRAMS := osc
+-
+-osc_SOURCES := \
+-        osc_create.c \
+-        osc_request.c
+-
+-osc_CFLAGS := $(EXTRA_KCFLAGS)
+-osc_LDFLAGS := $(EXTRA_KLDFLAGS)
+-osc_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # Darwin
++#if DARWIN
++#macos_PROGRAMS := osc
++#
++#osc_SOURCES := \
++#        osc_create.c \
++#        osc_request.c
++#
++#osc_CFLAGS := $(EXTRA_KCFLAGS)
++#osc_LDFLAGS := $(EXTRA_KLDFLAGS)
++#osc_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # Darwin
+ 
+ endif
+ 
+diff -Nurwd orig/lustre-1.8.2/lustre/osc/autoMakefile.in lustre-1.8.2/lustre/osc/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/osc/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/osc/autoMakefile.in	2010-03-03 16:00:14.063632838 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -86374,7 +88303,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -86383,7 +88312,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86394,7 +88323,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86425,7 +88354,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -335,21 +335,6 @@
+@@ -338,21 +338,6 @@
  @LIBLUSTRE_TRUE at libosc_a_CFLAGS = $(LLCFLAGS)
  
  @LINUX_TRUE@@MODULES_TRUE at modulefs_DATA = osc$(KMODEXT)
@@ -86447,7 +88376,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  subdir = lustre/osc
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -365,38 +350,22 @@
+@@ -368,38 +353,22 @@
  @LIBLUSTRE_TRUE@	libosc_a-osc_create.$(OBJEXT) \
  @LIBLUSTRE_TRUE@	libosc_a-cache.$(OBJEXT)
  libosc_a_OBJECTS = $(am_libosc_a_OBJECTS)
@@ -86490,7 +88419,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  
  all: all-am
  
-@@ -418,33 +387,6 @@
+@@ -421,33 +390,6 @@
  	-rm -f libosc.a
  	$(libosc_a_AR) libosc.a $(libosc_a_OBJECTS) $(libosc_a_LIBADD)
  	$(RANLIB) libosc.a
@@ -86524,7 +88453,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT) core *.core
-@@ -455,8 +397,6 @@
+@@ -458,8 +400,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libosc_a-cache.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libosc_a-osc_create.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libosc_a-osc_request.Po at am__quote@
@@ -86533,7 +88462,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  
  .c.o:
  @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@@ -545,50 +485,6 @@
+@@ -548,50 +488,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libosc_a-cache.Po' tmpdepfile='$(DEPDIR)/libosc_a-cache.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libosc_a_CPPFLAGS) $(CPPFLAGS) $(libosc_a_CFLAGS) $(CFLAGS) -c -o libosc_a-cache.obj `if test -f 'cache.c'; then $(CYGPATH_W) 'cache.c'; else $(CYGPATH_W) '$(srcdir)/cache.c'; fi`
@@ -86584,7 +88513,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  uninstall-info-am:
  modulefsDATA_INSTALL = $(INSTALL_DATA)
  install-modulefsDATA: $(modulefs_DATA)
-@@ -608,24 +504,6 @@
+@@ -611,24 +507,6 @@
  	  echo " rm -f $(DESTDIR)$(modulefsdir)/$$f"; \
  	  rm -f $(DESTDIR)$(modulefsdir)/$$f; \
  	done
@@ -86609,7 +88538,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  
  ETAGS = etags
  ETAGSFLAGS =
-@@ -714,10 +592,10 @@
+@@ -717,10 +595,10 @@
  	done
  check-am: all-am
  check: check-am
@@ -86622,7 +88551,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -745,8 +623,7 @@
+@@ -748,8 +626,7 @@
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
@@ -86632,7 +88561,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  
  distclean: distclean-am
  	-rm -rf ./$(DEPDIR)
-@@ -762,8 +639,7 @@
+@@ -765,8 +642,7 @@
  
  info-am:
  
@@ -86642,7 +88571,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
  
-@@ -792,23 +668,37 @@
+@@ -795,23 +671,37 @@
  
  ps-am:
  
@@ -86691,9 +88620,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/osc/autoMakefile.in lustre-1.8.1/lustre/osc
  install-data-hook: $(install_data_hook)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nurwd lustre-1.8.1.orig/lustre/ost/autoMakefile.in lustre-1.8.1/lustre/ost/autoMakefile.in
---- lustre-1.8.1.orig/lustre/ost/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/ost/autoMakefile.in	2009-09-10 11:17:04.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/ost/autoMakefile.in lustre-1.8.2/lustre/ost/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/ost/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/ost/autoMakefile.in	2010-03-03 16:00:14.115633723 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -86708,7 +88637,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ost/autoMakefile.in lustre-1.8.1/lustre/ost
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -86717,7 +88646,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ost/autoMakefile.in lustre-1.8.1/lustre/ost
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86728,7 +88657,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ost/autoMakefile.in lustre-1.8.1/lustre/ost
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86759,9 +88688,85 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ost/autoMakefile.in lustre-1.8.1/lustre/ost
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/ptlrpc/autoMakefile.in
---- lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/ptlrpc/autoMakefile.in	2009-09-10 11:17:05.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/ptlrpc/autoMakefile.am lustre-1.8.2/lustre/ptlrpc/autoMakefile.am
+--- orig/lustre-1.8.2/lustre/ptlrpc/autoMakefile.am	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/ptlrpc/autoMakefile.am	2010-03-03 15:57:14.827661168 +0000
+@@ -68,39 +68,39 @@
+ modulefs_DATA = ptlrpc$(KMODEXT)
+ endif #LINUX
+ 
+-if DARWIN
+-macos_PROGRAMS := ptlrpc
+-
+-ptlrpc_SOURCES := \
+-        ptlrpc_module.c \
+-        client.c \
+-        connection.c \
+-        events.c \
+-        import.c \
+-        llog_client.c \
+-        llog_net.c \
+-        llog_server.c \
+-        lproc_ptlrpc.c \
+-        niobuf.c \
+-        pack_generic.c \
+-        pers.c \
+-        pinger.c \
+-        ptlrpcd.c \
+-        recover.c \
+-        recov_thread.c \
+-        service.c \
+-	wiretest.c \
+-        $(LDLM_COMM_SOURCES)
+-
+-ptlrpc_CFLAGS := $(EXTRA_KCFLAGS)
+-ptlrpc_LDFLAGS := $(EXTRA_KLDFLAGS)
+-ptlrpc_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#if DARWIN
++#macos_PROGRAMS := ptlrpc
++#
++#ptlrpc_SOURCES := \
++#        ptlrpc_module.c \
++#        client.c \
++#        connection.c \
++#        events.c \
++#        import.c \
++#        llog_client.c \
++#        llog_net.c \
++#        llog_server.c \
++#        lproc_ptlrpc.c \
++#        niobuf.c \
++#        pack_generic.c \
++#        pers.c \
++#        pinger.c \
++#        ptlrpcd.c \
++#        recover.c \
++#        recov_thread.c \
++#        service.c \
++#	wiretest.c \
++#        $(LDLM_COMM_SOURCES)
++#
++#ptlrpc_CFLAGS := $(EXTRA_KCFLAGS)
++#ptlrpc_LDFLAGS := $(EXTRA_KLDFLAGS)
++#ptlrpc_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+ 
+ endif # MODULES
+ 
+diff -Nurwd orig/lustre-1.8.2/lustre/ptlrpc/autoMakefile.in lustre-1.8.2/lustre/ptlrpc/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/ptlrpc/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/ptlrpc/autoMakefile.in	2010-03-03 16:00:14.303633047 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -86776,7 +88781,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -86785,7 +88790,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86796,7 +88801,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86827,7 +88832,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-@@ -355,38 +355,6 @@
+@@ -358,38 +358,6 @@
  @LIBLUSTRE_TRUE at libptlrpc_a_CFLAGS = $(LLCFLAGS)
  
  @LINUX_TRUE@@MODULES_TRUE at modulefs_DATA = ptlrpc$(KMODEXT)
@@ -86866,7 +88871,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  subdir = lustre/ptlrpc
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -439,60 +407,6 @@
+@@ -442,60 +410,6 @@
  	libptlrpc_a-wiretest.$(OBJEXT) $(am__objects_1)
  @LIBLUSTRE_TRUE at am_libptlrpc_a_OBJECTS = $(am__objects_2)
  libptlrpc_a_OBJECTS = $(am_libptlrpc_a_OBJECTS)
@@ -86927,7 +88932,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -526,47 +440,16 @@
+@@ -529,47 +443,16 @@
  @AMDEP_TRUE@	./$(DEPDIR)/libptlrpc_a-recov_thread.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/libptlrpc_a-recover.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/libptlrpc_a-service.Po \
@@ -86979,7 +88984,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  
  all: all-am
  
-@@ -588,33 +471,6 @@
+@@ -591,33 +474,6 @@
  	-rm -f libptlrpc.a
  	$(libptlrpc_a_AR) libptlrpc.a $(libptlrpc_a_OBJECTS) $(libptlrpc_a_LIBADD)
  	$(RANLIB) libptlrpc.a
@@ -87013,7 +89018,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT) core *.core
-@@ -652,36 +508,6 @@
+@@ -655,36 +511,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libptlrpc_a-recover.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libptlrpc_a-service.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libptlrpc_a-wiretest.Po at am__quote@
@@ -87050,7 +89055,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  
  .c.o:
  @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@@ -1364,666 +1190,6 @@
+@@ -1367,666 +1193,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libptlrpc_a-ldlm_pool.Po' tmpdepfile='$(DEPDIR)/libptlrpc_a-ldlm_pool.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptlrpc_a_CPPFLAGS) $(CPPFLAGS) $(libptlrpc_a_CFLAGS) $(CFLAGS) -c -o libptlrpc_a-ldlm_pool.obj `if test -f '$(top_srcdir)/lustre/ldlm/ldlm_pool.c'; then $(CYGPATH_W) '$(top_srcdir)/lustre/ldlm/ldlm_pool.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lustre/ldlm/ldlm_pool.c'; fi`
@@ -87717,7 +89722,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  uninstall-info-am:
  modulefsDATA_INSTALL = $(INSTALL_DATA)
  install-modulefsDATA: $(modulefs_DATA)
-@@ -2043,24 +1209,6 @@
+@@ -2046,24 +1212,6 @@
  	  echo " rm -f $(DESTDIR)$(modulefsdir)/$$f"; \
  	  rm -f $(DESTDIR)$(modulefsdir)/$$f; \
  	done
@@ -87742,7 +89747,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  
  ETAGS = etags
  ETAGSFLAGS =
-@@ -2149,10 +1297,10 @@
+@@ -2152,10 +1300,10 @@
  	done
  check-am: all-am
  check: check-am
@@ -87755,7 +89760,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -2180,8 +1328,7 @@
+@@ -2183,8 +1331,7 @@
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
@@ -87765,7 +89770,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  
  distclean: distclean-am
  	-rm -rf ./$(DEPDIR)
-@@ -2197,8 +1344,7 @@
+@@ -2200,8 +1347,7 @@
  
  info-am:
  
@@ -87775,7 +89780,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
  
-@@ -2227,23 +1373,54 @@
+@@ -2230,23 +1376,54 @@
  
  ps-am:
  
@@ -87841,9 +89846,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/ptlrpc/autoMakefile.in lustre-1.8.1/lustre/
  install-data-hook: $(install_data_hook)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nurwd lustre-1.8.1.orig/lustre/quota/autoMakefile.in lustre-1.8.1/lustre/quota/autoMakefile.in
---- lustre-1.8.1.orig/lustre/quota/autoMakefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/quota/autoMakefile.in	2009-09-10 11:17:05.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/quota/autoMakefile.in lustre-1.8.2/lustre/quota/autoMakefile.in
+--- orig/lustre-1.8.2/lustre/quota/autoMakefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/quota/autoMakefile.in	2010-03-03 16:00:14.387632830 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -87858,7 +89863,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/quota/autoMakefile.in lustre-1.8.1/lustre/q
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -273,8 +272,6 @@
+@@ -277,8 +276,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -87867,7 +89872,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/quota/autoMakefile.in lustre-1.8.1/lustre/q
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -288,8 +285,10 @@
+@@ -292,8 +289,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -87878,7 +89883,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/quota/autoMakefile.in lustre-1.8.1/lustre/q
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -297,26 +296,27 @@
+@@ -301,26 +300,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -87909,9 +89914,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/quota/autoMakefile.in lustre-1.8.1/lustre/q
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/scripts/Makefile.in lustre-1.8.1/lustre/scripts/Makefile.in
---- lustre-1.8.1.orig/lustre/scripts/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/scripts/Makefile.in	2009-09-10 11:17:05.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/scripts/Makefile.in lustre-1.8.2/lustre/scripts/Makefile.in
+--- orig/lustre-1.8.2/lustre/scripts/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/scripts/Makefile.in	2010-03-03 16:00:14.447634167 +0000
 @@ -155,12 +155,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -87926,7 +89931,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/scripts/Makefile.in lustre-1.8.1/lustre/scr
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -272,8 +271,6 @@
+@@ -276,8 +275,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -87935,7 +89940,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/scripts/Makefile.in lustre-1.8.1/lustre/scr
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -287,8 +284,10 @@
+@@ -291,8 +288,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -87946,7 +89951,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/scripts/Makefile.in lustre-1.8.1/lustre/scr
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -296,26 +295,27 @@
+@@ -300,26 +299,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -87977,9 +89982,137 @@ diff -Nurwd lustre-1.8.1.orig/lustre/scripts/Makefile.in lustre-1.8.1/lustre/scr
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/tests/Makefile.in lustre-1.8.1/lustre/tests/Makefile.in
---- lustre-1.8.1.orig/lustre/tests/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/tests/Makefile.in	2009-09-10 11:17:05.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/scripts/lc_cluman.in lustre-1.8.2/lustre/scripts/lc_cluman.in
+--- orig/lustre-1.8.2/lustre/scripts/lc_cluman.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/scripts/lc_cluman.in	2010-03-03 15:57:14.867633986 +0000
+@@ -38,7 +38,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #****************************** Global variables ******************************#
+ TMP_DIR=${CLUMGR_TMP_DIR}		# Temporary directory
+diff -Nurwd orig/lustre-1.8.2/lustre/scripts/lc_hb.in lustre-1.8.2/lustre/scripts/lc_hb.in
+--- orig/lustre-1.8.2/lustre/scripts/lc_hb.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/scripts/lc_hb.in	2010-03-03 15:57:14.867633986 +0000
+@@ -34,7 +34,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #****************************** Global variables ******************************#
+ # Heartbeat tools
+diff -Nurwd orig/lustre-1.8.2/lustre/scripts/lc_lvm.in lustre-1.8.2/lustre/scripts/lc_lvm.in
+--- orig/lustre-1.8.2/lustre/scripts/lc_lvm.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/scripts/lc_lvm.in	2010-03-03 15:57:14.867633986 +0000
+@@ -118,7 +118,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #***************************** Global variables *****************************#
+ # All the LVM device items in the csv file
+diff -Nurwd orig/lustre-1.8.2/lustre/scripts/lc_md.in lustre-1.8.2/lustre/scripts/lc_md.in
+--- orig/lustre-1.8.2/lustre/scripts/lc_md.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/scripts/lc_md.in	2010-03-03 15:57:14.867633986 +0000
+@@ -70,7 +70,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #***************************** Global variables *****************************#
+ # All the MD device items in the csv file
+diff -Nurwd orig/lustre-1.8.2/lustre/scripts/lc_modprobe.in lustre-1.8.2/lustre/scripts/lc_modprobe.in
+--- orig/lustre-1.8.2/lustre/scripts/lc_modprobe.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/scripts/lc_modprobe.in	2010-03-03 15:57:14.867633986 +0000
+@@ -6,7 +6,7 @@
+ #################################################################################
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ # Check the kernel version
+ KERNEL_VERSION=`uname -r`
+diff -Nurwd orig/lustre-1.8.2/lustre/scripts/lc_net.in lustre-1.8.2/lustre/scripts/lc_net.in
+--- orig/lustre-1.8.2/lustre/scripts/lc_net.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/scripts/lc_net.in	2010-03-03 15:57:14.867633986 +0000
+@@ -30,7 +30,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ VERBOSE_OUTPUT=false
+ # Get and check the positional parameters
+diff -Nurwd orig/lustre-1.8.2/lustre/scripts/lustre_config.in lustre-1.8.2/lustre/scripts/lustre_config.in
+--- orig/lustre-1.8.2/lustre/scripts/lustre_config.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/scripts/lustre_config.in	2010-03-03 15:57:14.871660545 +0000
+@@ -233,7 +233,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #***************************** Global variables *****************************#
+ declare -a NODE_NAMES               # node names in the failover group
+diff -Nurwd orig/lustre-1.8.2/lustre/scripts/lustre_createcsv.in lustre-1.8.2/lustre/scripts/lustre_createcsv.in
+--- orig/lustre-1.8.2/lustre/scripts/lustre_createcsv.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/scripts/lustre_createcsv.in	2010-03-03 15:57:14.871660545 +0000
+@@ -39,7 +39,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #**************************** Global variables ****************************#
+ # csv file
+diff -Nurwd orig/lustre-1.8.2/lustre/scripts/version_tag.pl lustre-1.8.2/lustre/scripts/version_tag.pl
+--- orig/lustre-1.8.2/lustre/scripts/version_tag.pl	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/scripts/version_tag.pl	2010-03-03 15:57:14.919642480 +0000
+@@ -166,8 +166,9 @@
+         !$ver->open("$objdir/include/linux/version.h") &&
+         !$ver->open("$dir/include/linux/utsrelease.h") &&
+         !$ver->open("$dir/include/linux/version.h")) {
+-            die "Run make dep on '$dir'\n";
+-        }
++            #die "Run make dep on '$dir'\n";
++	    $kernver = "UNKOWN-KERNEL";
++        } else {
+ 
+     while(defined($line = <$ver>)) {
+         $line =~ /\#define UTS_RELEASE "(.*)"/;
+@@ -177,6 +178,7 @@
+         }
+     }
+     $ver->close();
++	}
+     chomp($kernver);
+     $dir =~ s/\//\./g;
+     return $dir;
+@@ -254,6 +256,8 @@
+     if (!defined($ENV{LUSTRE_VERS}));
+ 
+ if ($progname eq "version_tag.pl") {
++    chdir($cwd);
++    chdir($ARGV[1]);
+     my $linuxdir = get_linuxdir();
+     $linuxdir =~ s/\//\./g;
+     generate_ver($tag, $mtime, $linuxdir);
+diff -Nurwd orig/lustre-1.8.2/lustre/tests/Makefile.in lustre-1.8.2/lustre/tests/Makefile.in
+--- orig/lustre-1.8.2/lustre/tests/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/tests/Makefile.in	2010-03-03 16:00:14.627633224 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -87994,7 +90127,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/tests/Makefile.in lustre-1.8.1/lustre/tests
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -88003,7 +90136,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/tests/Makefile.in lustre-1.8.1/lustre/tests
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88014,7 +90147,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/tests/Makefile.in lustre-1.8.1/lustre/tests
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88045,9 +90178,27 @@ diff -Nurwd lustre-1.8.1.orig/lustre/tests/Makefile.in lustre-1.8.1/lustre/tests
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/tests/mpi/Makefile.in lustre-1.8.1/lustre/tests/mpi/Makefile.in
---- lustre-1.8.1.orig/lustre/tests/mpi/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/tests/mpi/Makefile.in	2009-09-10 11:17:06.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/tests/acl/make-tree lustre-1.8.2/lustre/tests/acl/make-tree
+--- orig/lustre-1.8.2/lustre/tests/acl/make-tree	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/tests/acl/make-tree	2010-03-03 15:57:14.911636435 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # reduce LEVELS from 3 => 2 by CFS
+ LEVELS=2 ;		[ -z "$1" ] || LEVELS=$1
+diff -Nurwd orig/lustre-1.8.2/lustre/tests/insanity.sh lustre-1.8.2/lustre/tests/insanity.sh
+--- orig/lustre-1.8.2/lustre/tests/insanity.sh	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/tests/insanity.sh	2010-03-03 15:57:14.911636435 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # Test multiple failures, AKA Test 17
+ 
+ set -e
+diff -Nurwd orig/lustre-1.8.2/lustre/tests/mpi/Makefile.in lustre-1.8.2/lustre/tests/mpi/Makefile.in
+--- orig/lustre-1.8.2/lustre/tests/mpi/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/tests/mpi/Makefile.in	2010-03-03 16:00:14.711634265 +0000
 @@ -120,12 +120,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -88062,7 +90213,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/tests/mpi/Makefile.in lustre-1.8.1/lustre/t
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -237,8 +236,6 @@
+@@ -241,8 +240,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -88071,7 +90222,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/tests/mpi/Makefile.in lustre-1.8.1/lustre/t
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -252,8 +249,10 @@
+@@ -256,8 +253,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88082,7 +90233,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/tests/mpi/Makefile.in lustre-1.8.1/lustre/t
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -261,26 +260,27 @@
+@@ -265,26 +264,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88113,9 +90264,25 @@ diff -Nurwd lustre-1.8.1.orig/lustre/tests/mpi/Makefile.in lustre-1.8.1/lustre/t
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/lustre/utils/Makefile.in lustre-1.8.1/lustre/utils/Makefile.in
---- lustre-1.8.1.orig/lustre/utils/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/lustre/utils/Makefile.in	2009-09-10 11:17:06.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/lustre/tests/runiozone lustre-1.8.2/lustre/tests/runiozone
+--- orig/lustre-1.8.2/lustre/tests/runiozone	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/tests/runiozone	2010-03-03 15:57:14.907633482 +0000
+@@ -9,9 +9,11 @@
+ LOOP=0
+ rm -f endiozone
+ echo 0 > /proc/sys/lnet/debug
++tmpfile=$(mktemp -t iozone.XXXXXXXXXXXX)
+ while date; do
+ 	LOOP=`expr $LOOP + 1`
+ 	echo "Test #$LOOP"
+ 	iozone $VERIFY $ODIR -r $REC -i 0 -i 1 -f $FILE -s $SIZE 2>&1 || exit $?
+ 	[ -f endiozone -o $LOOP -ge $COUNT ] && rm -f endiozone && exit 0
+-done | tee /tmp/iozone.log
++done | tee $tmpfile
++echo "You'll find the log of this iozone run at: $tmpfile"
+diff -Nurwd orig/lustre-1.8.2/lustre/utils/Makefile.in lustre-1.8.2/lustre/utils/Makefile.in
+--- orig/lustre-1.8.2/lustre/utils/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/lustre/utils/Makefile.in	2010-03-03 16:00:14.879654511 +0000
 @@ -122,12 +122,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -88130,7 +90297,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/utils/Makefile.in lustre-1.8.1/lustre/utils
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -239,8 +238,6 @@
+@@ -243,8 +242,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -88139,7 +90306,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/utils/Makefile.in lustre-1.8.1/lustre/utils
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -254,8 +251,10 @@
+@@ -258,8 +255,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88150,7 +90317,7 @@ diff -Nurwd lustre-1.8.1.orig/lustre/utils/Makefile.in lustre-1.8.1/lustre/utils
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -263,26 +262,27 @@
+@@ -267,26 +266,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88181,9 +90348,9 @@ diff -Nurwd lustre-1.8.1.orig/lustre/utils/Makefile.in lustre-1.8.1/lustre/utils
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/snmp/autoconf/Makefile.in lustre-1.8.1/snmp/autoconf/Makefile.in
---- lustre-1.8.1.orig/snmp/autoconf/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/snmp/autoconf/Makefile.in	2009-09-10 11:17:06.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/snmp/Makefile.in lustre-1.8.2/snmp/Makefile.in
+--- orig/lustre-1.8.2/snmp/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/snmp/Makefile.in	2010-03-03 16:00:14.967632376 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -88198,7 +90365,7 @@ diff -Nurwd lustre-1.8.1.orig/snmp/autoconf/Makefile.in lustre-1.8.1/snmp/autoco
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -88207,7 +90374,7 @@ diff -Nurwd lustre-1.8.1.orig/snmp/autoconf/Makefile.in lustre-1.8.1/snmp/autoco
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88218,7 +90385,7 @@ diff -Nurwd lustre-1.8.1.orig/snmp/autoconf/Makefile.in lustre-1.8.1/snmp/autoco
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88249,9 +90416,9 @@ diff -Nurwd lustre-1.8.1.orig/snmp/autoconf/Makefile.in lustre-1.8.1/snmp/autoco
  rootsbindir = @rootsbindir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
-diff -Nurwd lustre-1.8.1.orig/snmp/Makefile.in lustre-1.8.1/snmp/Makefile.in
---- lustre-1.8.1.orig/snmp/Makefile.in	2009-09-10 11:16:34.000000000 +0200
-+++ lustre-1.8.1/snmp/Makefile.in	2009-09-10 11:17:06.000000000 +0200
+diff -Nurwd orig/lustre-1.8.2/snmp/autoconf/Makefile.in lustre-1.8.2/snmp/autoconf/Makefile.in
+--- orig/lustre-1.8.2/snmp/autoconf/Makefile.in	2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/snmp/autoconf/Makefile.in	2010-03-03 16:00:15.015633724 +0000
 @@ -119,12 +119,11 @@
  EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
  EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
@@ -88266,7 +90433,7 @@ diff -Nurwd lustre-1.8.1.orig/snmp/Makefile.in lustre-1.8.1/snmp/Makefile.in
  IIBCPPFLAGS = @IIBCPPFLAGS@
  IIBLND = @IIBLND@
  INCLUDE_RULES = @INCLUDE_RULES@
-@@ -236,8 +235,6 @@
+@@ -240,8 +239,6 @@
  ZLIB = @ZLIB@
  ac_configure_args = @ac_configure_args@
  ac_ct_CC = @ac_ct_CC@
@@ -88275,7 +90442,7 @@ diff -Nurwd lustre-1.8.1.orig/snmp/Makefile.in lustre-1.8.1/snmp/Makefile.in
  agentdir = @agentdir@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -251,8 +248,10 @@
+@@ -255,8 +252,10 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88286,7 +90453,7 @@ diff -Nurwd lustre-1.8.1.orig/snmp/Makefile.in lustre-1.8.1/snmp/Makefile.in
  enable_uoss = @enable_uoss@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -260,26 +259,27 @@
+@@ -264,26 +263,27 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
diff --git a/debian/rules b/debian/rules
index b055a15..9de8d67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ autogen-stamp: patch-stamp
 	cp /usr/share/misc/config.guess config.guess
 	cp /usr/share/misc/config.guess libsysio/config.guess
 	cp /usr/share/misc/config.guess ldiskfs/config.guess
-	sh ./autogen.sh
+	#sh ./autogen.sh
 	touch $@
 
 configure: configure-stamp

-- 
Lustre Debian Packaging 



More information about the Pkg-lustre-svn-commit mailing list