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

[CVS commit program]

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

Modified Files:
      Tag: Orange-Branch
	configure pvfs2-config.h.in 
Log Message:
first pass of changes to support kernel changes in 2.6.36 and removal of the BKL. note: no locking has been added to the ioctls so it may not yet be safe


Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure,v
diff -p -u -r1.414.4.20 -r1.414.4.21
--- configure	5 Apr 2011 05:05:54 -0000	1.414.4.20
+++ configure	5 Apr 2011 14:15:06 -0000	1.414.4.21
@@ -6734,14 +6734,16 @@ rm -f core conftest.err conftest.$ac_obj
 
 	fi
 
+	CFLAGS="$CFLAGS -Werror"
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dentry argument in kernel super_operations statfs" >&5
 $as_echo_n "checking for dentry argument in kernel super_operations statfs... " >&6; }
-															cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+														                                        	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#define __KERNEL__
 		#include <linux/fs.h>
-		int vfs_statfs(struct dentry *de, struct kstatfs *kfs)
+                struct super_operations sop;
+		int s(struct dentry *de, struct kstatfs *kfs)
 		{
 			return 0;
 		}
@@ -6750,6 +6752,8 @@ int
 main ()
 {
 
+                    sop.statfs = s;
+
   ;
   return 0;
 }
@@ -6766,6 +6770,7 @@ $as_echo "no" >&6; }
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	CFLAGS=$tmp_cflags
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vfsmount argument in kernel file_system_type get_sb" >&5
 $as_echo_n "checking for vfsmount argument in kernel file_system_type get_sb... " >&6; }
@@ -8642,6 +8647,80 @@ $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         CFLAGS=$tmp_cflags
+
+		tmp_cflags=$CFLAGS
+	CFLAGS="$CFLAGS -Werror"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unlocked_ioctl in file_operations" >&5
+$as_echo_n "checking for unlocked_ioctl in file_operations... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+		#define __KERNEL__
+		#include <linux/fs.h>
+		static struct file_operations f;
+
+int
+main ()
+{
+
+	    f.unlocked_ioctl = NULL;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_UNLOCKED_IOCTL_HANDLER 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
+
+		tmp_cflags=$CFLAGS
+	CFLAGS="$CFLAGS -Werror"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inode_setattr" >&5
+$as_echo_n "checking for inode_setattr... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+		#define __KERNEL__
+		#include <linux/fs.h>
+                struct iattr *iattr;
+                struct inode *inode;
+
+int
+main ()
+{
+
+	        inode_setattr(inode, iattr);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_INODE_SETATTR 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
+
+
+
 
 	CFLAGS=$oldcflags
 

Index: pvfs2-config.h.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/pvfs2-config.h.in,v
diff -p -u -r1.128.8.7 -r1.128.8.8
--- pvfs2-config.h.in	3 Feb 2011 18:20:32 -0000	1.128.8.7
+++ pvfs2-config.h.in	5 Apr 2011 14:15:17 -0000	1.128.8.8
@@ -168,6 +168,9 @@
 /* Define if kernel has iget_locked */
 #undef HAVE_IGET_LOCKED
 
+/* Define if inode_setattr is defined */
+#undef HAVE_INODE_SETATTR
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -436,6 +439,9 @@
 
 /* Define if DB stat function takes malloc function ptr */
 #undef HAVE_UNKNOWN_PARAMETER_TO_DB_STAT
+
+/* Define if file_operations struct has unlocked_ioctl member */
+#undef HAVE_UNLOCKED_IOCTL_HANDLER
 
 /* Define if include file valgrind.h exists */
 #undef HAVE_VALGRIND_H