[Pvfs2-cvs] commit by pw in pvfs2: pvfs2-config.h.in configure

[CVS commit program]

Update of /projects/cvsroot/pvfs2
In directory parlweb1:/tmp/cvs-serv31655

Modified Files:
	pvfs2-config.h.in configure 
Log Message:
Accommodate new rwlock type in struct address_space.  From murali with
fixes.


Index: pvfs2-config.h.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/pvfs2-config.h.in,v
diff -u -p -p -u -r1.112 -r1.113
--- pvfs2-config.h.in	7 Dec 2007 23:05:56 -0000	1.112
+++ pvfs2-config.h.in	11 Jan 2008 15:00:08 -0000	1.113
@@ -280,8 +280,13 @@
 /* Define if SLAB_KERNEL is defined in kernel */
 #undef HAVE_SLAB_KERNEL
 
-/* Define if kernel address_space struct has a spin_lock instead of rw_lock */
-#undef HAVE_SPIN_LOCK_ADDR_SPACE_STRUCT
+/* Define if kernel address_space struct has a spin_lock member named
+   page_lock instead of rw_lock */
+#undef HAVE_SPIN_LOCK_PAGE_ADDR_SPACE_STRUCT
+
+/* Define if kernel address_space struct has a spin_lock member named
+   tree_lock instead of rw_lock */
+#undef HAVE_SPIN_LOCK_TREE_ADDR_SPACE_STRUCT
 
 /* Define if struct super_operations in kernel has statfs_lite callback */
 #undef HAVE_STATFS_LITE_SUPER_OPERATIONS

Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure,v
diff -u -p -p -u -r1.370 -r1.371
--- configure	11 Dec 2007 15:51:19 -0000	1.370
+++ configure	11 Jan 2008 15:00:08 -0000	1.371
@@ -11484,7 +11484,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
 echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_SPIN_LOCK_ADDR_SPACE_STRUCT 1
+#define HAVE_SPIN_LOCK_PAGE_ADDR_SPACE_STRUCT 1
 _ACEOF
 
 else
@@ -11498,6 +11498,66 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+        { echo "$as_me:$LINENO: checking if kernel address_space struct has a rwlock_t field named tree_lock" >&5
+echo $ECHO_N "checking if kernel address_space struct has a rwlock_t field named tree_lock... $ECHO_C" >&6; }
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+		#define __KERNEL__
+		#include <linux/fs.h>
+
+int
+main ()
+{
+
+		struct address_space as;
+		read_lock(&as.tree_lock);
+
+  ;
+  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
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SPIN_LOCK_TREE_ADDR_SPACE_STRUCT 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; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 	{ echo "$as_me:$LINENO: checking if kernel address_space struct has a priv_lock field - from RT linux" >&5
 echo $ECHO_N "checking if kernel address_space struct has a priv_lock field - from RT linux... $ECHO_C" >&6; }
 	cat >conftest.$ac_ext <<_ACEOF
@@ -16625,7 +16685,7 @@ if test "$ac_res" != no; then
   ac_cv_func_getmntent=yes
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETMNTENT 1
+#define HAVE_GETMNTENT
 _ACEOF
 
 else