[Ocfs2-commits] manish commits r1476 - in trunk: . src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-09-20 14:07:36 -0500 (Mon, 20 Sep 2004)
New Revision: 1476

Modified:
   trunk/configure.in
   trunk/src/Makefile
   trunk/src/alloc.c
   trunk/src/file.c
Log:
Enable aio for 2.6


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-09-16 21:50:42 UTC (rev 1475)
+++ trunk/configure.in	2004-09-20 19:07:36 UTC (rev 1476)
@@ -243,8 +243,10 @@
 
 AC_MSG_CHECKING([whether to build aio])
 if test "x$OCFS_AIO" = "xyes"; then
-  if egrep "EXPORT_SYMBOL.*\(brw_kvec_async\);" "$kernelsrc/kernel/ksyms.c" "$kernelsrc/fs/buffer.c" >/dev/null 2>&1; then
+  if test "x$KERNEL_26" = "xyes"; then
     have_aio=yes
+  elif egrep "EXPORT_SYMBOL.*\(brw_kvec_async\);" "$kernelsrc/kernel/ksyms.c" "$kernelsrc/fs/buffer.c" >/dev/null 2>&1; then
+    have_aio=yes
   else
     have_aio=no
   fi

Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2004-09-16 21:50:42 UTC (rev 1475)
+++ trunk/src/Makefile	2004-09-20 19:07:36 UTC (rev 1476)
@@ -30,8 +30,12 @@
 endif
 
 ifdef OCFS_AIO
+ifeq ($(KERNELRELEASE),)
 GLOBAL_DEFINES += -DAIO_ENABLED
+else
+GLOBAL_DEFINES += -DAIO_26_ENABLED
 endif
+endif
 
 ifdef OCFS_TRACE
 GLOBAL_DEFINES += -DTRACE

Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c	2004-09-16 21:50:42 UTC (rev 1475)
+++ trunk/src/alloc.c	2004-09-20 19:07:36 UTC (rev 1476)
@@ -1230,7 +1230,7 @@
 	LOG_TRACE_STR("Using NON-local extents");
 
 	/*** Nonlocal Extents ***/
-	/* This is now less likely with OCFSv2 extent lists */
+	/* This is now less likely with OCFS2 extent lists */
 	if (fel->l_tree_depth > 4)
 		LOG_ERROR_ARGS ("inode %llu, tree_depth=%u", 
 				OCFS_I(inode)->ip_blkno, fel->l_tree_depth);

Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c	2004-09-16 21:50:42 UTC (rev 1475)
+++ trunk/src/file.c	2004-09-20 19:07:36 UTC (rev 1476)
@@ -813,12 +813,14 @@
 	.release = ocfs_file_release,
 	.open = ocfs_file_open,
 	.ioctl = ocfs_ioctl,
+#if defined(AIO_ENABLED) || defined(AIO_26_ENABLED)
+	.aio_read = generic_file_aio_read,
+	.aio_write = generic_file_aio_write,
 #ifdef AIO_ENABLED
 	.kvec_read = ocfs_kvec_read,
 	.kvec_write = ocfs_kvec_write,
-	.aio_read = generic_file_aio_read,
-	.aio_write = generic_file_aio_write,
 #endif
+#endif
 };
 
 struct file_operations ocfs_dops = {