[Pvfs2-cvs] commit by slang in pvfs2: configure pvfs2-config.h.in
CVS commit program
cvs at parl.clemson.edu
Thu Jan 11 16:18:13 EST 2007
Update of /projects/cvsroot/pvfs2
In directory parlweb1:/tmp/cvs-serv1100
Modified Files:
Tag: pvfs-2-6-branch
configure pvfs2-config.h.in
Log Message:
revert changes that duplicate pete's fixes for 2.6.19
Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure,v
diff -p -u -r1.323.6.6 -r1.323.6.7
--- configure 11 Jan 2007 20:50:42 -0000 1.323.6.6
+++ configure 11 Jan 2007 21:18:10 -0000 1.323.6.7
@@ -9246,155 +9246,6 @@ fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: checking for readv callback in struct file_operations in kernel" >&5
-echo $ECHO_N "checking for readv callback in struct file_operations in kernel... $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>
- static struct file_operations fop = {
- .readv = NULL,
- };
-
-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); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (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_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (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_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_READV_FILE_OPERATIONS 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 conftest.err conftest.$ac_objext conftest.$ac_ext
- { echo "$as_me:$LINENO: checking for writev callback in struct file_operations in kernel" >&5
-echo $ECHO_N "checking for writev callback in struct file_operations in kernel... $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>
- static struct file_operations fop = {
- .writev = NULL,
- };
-
-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); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (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_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (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_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_WRITEV_FILE_OPERATIONS 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 conftest.err conftest.$ac_objext conftest.$ac_ext
-
{ echo "$as_me:$LINENO: checking for find_inode_handle callback in struct super_operations in kernel" >&5
echo $ECHO_N "checking for find_inode_handle callback in struct super_operations in kernel... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
@@ -10302,86 +10153,6 @@ echo "${ECHO_T}no" >&6; }
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- tmp_cflags=$CFLAGS
- CFLAGS="$CFLAGS -Werror"
- { echo "$as_me:$LINENO: checking for new prototype of aio_read callback of file_operations structure" >&5
-echo $ECHO_N "checking for new prototype of aio_read callback of file_operations structure... $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>
- extern ssize_t my_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
- static struct file_operations fop = {
- .aio_read = my_aio_read,
- };
-
-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); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (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_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (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_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_AIO_NEW_AIO_SIGNATURE 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 conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$tmp_cflags
-
fi
tmp_cflags=$CFLAGS
@@ -11842,79 +11613,6 @@ echo "${ECHO_T}yes" >&6; }
cat >>confdefs.h <<\_ACEOF
#define HAVE_INT_RETURN_INODE_OPERATIONS_FOLLOW_LINK 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 conftest.err conftest.$ac_objext conftest.$ac_ext
-
- { echo "$as_me:$LINENO: checking for int return in kmem_cache_destroy" >&5
-echo $ECHO_N "checking for int return in kmem_cache_destroy... $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/slab.h>
- extern int kmem_cache_destroy(kmem_cache_t *);
-
-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); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (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_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (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_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_INT_RETURN_KMEM_CACHE_DESTROY 1
_ACEOF
else
Index: pvfs2-config.h.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/pvfs2-config.h.in,v
diff -p -u -r1.88.6.4 -r1.88.6.5
--- pvfs2-config.h.in 11 Jan 2007 20:50:46 -0000 1.88.6.4
+++ pvfs2-config.h.in 11 Jan 2007 21:18:13 -0000 1.88.6.5
@@ -6,9 +6,6 @@
/* Define if kernel has aio support */
#undef HAVE_AIO
-/* Define if VFS AIO support in kernel has a new prototype */
-#undef HAVE_AIO_NEW_AIO_SIGNATURE
-
/* Define if we are enabling VFS AIO support in kernel */
#undef HAVE_AIO_VFS_SUPPORT
@@ -129,9 +126,6 @@
/* Define if return value from follow_link in inode_operations is type int */
#undef HAVE_INT_RETURN_INODE_OPERATIONS_FOLLOW_LINK
-/* Define if return value from kmem_cache_destroy is type int */
-#undef HAVE_INT_RETURN_KMEM_CACHE_DESTROY
-
/* Define if struct inode in kernel has i_blksize member */
#undef HAVE_I_BLKSIZE_IN_STRUCT_INODE
@@ -207,9 +201,6 @@
/* Define if struct file_operations in kernel has readdirplus callback */
#undef HAVE_READDIRPLUS_FILE_OPERATIONS
-/* Define if struct file_operations in kernel has readv callback */
-#undef HAVE_READV_FILE_OPERATIONS
-
/* Define if struct file_operations in kernel has readx callback */
#undef HAVE_READX_FILE_OPERATIONS
@@ -296,9 +287,6 @@
/* Define if get_sb callback has struct vfsmount argument */
#undef HAVE_VFSMOUNT_GETSB
-
-/* Define if struct file_operations in kernel has writev callback */
-#undef HAVE_WRITEV_FILE_OPERATIONS
/* Define if struct file_operations in kernel has writex callback */
#undef HAVE_WRITEX_FILE_OPERATIONS
More information about the Pvfs2-cvs
mailing list