[Ocfs2-commits] jlbec commits r1831 - in trunk: . fs fs/ocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-01-21 19:47:41 -0600 (Fri, 21 Jan 2005)
New Revision: 1831

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/fs/Makefile
   trunk/fs/ocfs2/24io.c
   trunk/fs/ocfs2/Makefile
   trunk/fs/ocfs2/file.c
   trunk/fs/ocfs2/inode.h
Log:
o Remove AIO conditionals.  We always build it.

Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-01-21 23:24:41 UTC (rev 1830)
+++ trunk/Config.make.in	2005-01-22 01:47:41 UTC (rev 1831)
@@ -61,6 +61,5 @@
 
 OCFS_DEBUG = @OCFS_DEBUG@
 OCFS_LARGEIO = @OCFS_LARGEIO@
-OCFS_AIO = @OCFS_AIO@
 OCFS_TRACE = @OCFS_TRACE@
 OCFS_PROCESSOR = @OCFS_PROCESSOR@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-01-21 23:24:41 UTC (rev 1830)
+++ trunk/configure.in	2005-01-22 01:47:41 UTC (rev 1831)
@@ -91,15 +91,6 @@
 AC_SUBST(OCFS_DEBUG)
 AC_MSG_RESULT($enable_debug)
 
-AC_MSG_CHECKING(for aio)
-AC_ARG_ENABLE(aio, [  --enable-aio=[yes/no]         Turn on aio [default=yes]],,enable_aio=yes)
-OCFS_AIO=yes
-if test "x$enable_aio" = "xno"; then
-  OCFS_AIO=
-fi
-AC_SUBST(OCFS_AIO)
-AC_MSG_RESULT($enable_aio)
-
 AC_MSG_CHECKING(for tracing)
 AC_ARG_ENABLE(trace, [  --enable-trace=[yes/no]         Turn on tracing [default=yes]],,enable_trace=yes)
 OCFS_TRACE=
@@ -208,25 +199,6 @@
 
 KERNELSRC=$kernelsrc
 
-AC_MSG_CHECKING([whether to build aio])
-if test "x$OCFS_AIO" = "xyes"; then
-  if test "x$KERNEL_26" = "xyes"; then
-    have_aio=yes
-  elif egrep "EXPORT_SYMBOL.*\(aio_complete\);" "$kerneldir/fs/aio.c" >/dev/null 2>&1; then
-    have_aio=yes
-  else
-    have_aio=no
-  fi
-
-  AC_MSG_RESULT($have_aio)
-
-  if test "x$have_aio" = "xno"; then
-    OCFS_AIO=
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-
 COMPAT_SAFE_WRITE=
 AC_MSG_CHECKING([for safe write ordering])
 if test "x$KERNEL_26" = "xyes"; then

Modified: trunk/fs/Makefile
===================================================================
--- trunk/fs/Makefile	2005-01-21 23:24:41 UTC (rev 1830)
+++ trunk/fs/Makefile	2005-01-22 01:47:41 UTC (rev 1831)
@@ -41,6 +41,10 @@
 
 INSTALL_RULES = install-modules
 
+# Traverse subdirs via Makebo for "make dist"
+ifeq ($(MAKECMDGOALS),dist-all)
+SUBDIRS = $(SAFE_SUBDIRS)
+endif
 
 build-modules:
 	$(MAKE) -C ocfs2 stamp-md5

Modified: trunk/fs/ocfs2/24io.c
===================================================================
--- trunk/fs/ocfs2/24io.c	2005-01-21 23:24:41 UTC (rev 1830)
+++ trunk/fs/ocfs2/24io.c	2005-01-22 01:47:41 UTC (rev 1831)
@@ -309,7 +309,6 @@
 	return err;
 }				/* ocfs_rw_direct */
 
-#ifdef AIO_ENABLED
 static void ocfs_aio_issue(void * _iocb);
 
 static void ocfs_aio_complete(struct kiocb *iocb, long res) { 
@@ -476,5 +475,4 @@
 	return ret;
 }
 
-#endif /* aio */
 #endif /* 2.6 */

Modified: trunk/fs/ocfs2/Makefile
===================================================================
--- trunk/fs/ocfs2/Makefile	2005-01-21 23:24:41 UTC (rev 1830)
+++ trunk/fs/ocfs2/Makefile	2005-01-22 01:47:41 UTC (rev 1831)
@@ -22,14 +22,6 @@
 
 MODULE_DEFINES += -DCATCH_BH_JBD_RACES
 
-ifdef OCFS_AIO
-ifeq ($(KERNELRELEASE),)
-MODULE_DEFINES += -DAIO_ENABLED
-else
-MODULE_DEFINES += -DAIO_26_ENABLED
-endif
-endif
-
 ifdef OCFS_TRACE
 MODULE_DEFINES += -DTRACE
 endif
@@ -157,6 +149,11 @@
 # This is a 2.6 kernel. Just forward to kbuild.
 #
 
+# Traverse subdirs via Makebo for "make dist"
+ifeq ($(MAKECMDGOALS),dist-all)
+SUBDIRS = $(SAFE_SUBDIRS)
+endif
+
 build-modules:
 	$(MAKE) -C $(TOPDIR)/fs build-modules
 

Modified: trunk/fs/ocfs2/file.c
===================================================================
--- trunk/fs/ocfs2/file.c	2005-01-21 23:24:41 UTC (rev 1830)
+++ trunk/fs/ocfs2/file.c	2005-01-22 01:47:41 UTC (rev 1831)
@@ -25,6 +25,8 @@
 
 #include "ocfs_compat.h"
 
+#include <linux/version.h>
+
 #include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/slab.h>
@@ -513,11 +515,10 @@
 	.release = ocfs_file_release,
 	.open = ocfs_file_open,
 	.ioctl = ocfs_ioctl,
-#if defined(AIO_26_ENABLED)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	.aio_read = generic_file_aio_read,
 	.aio_write = generic_file_aio_write,
-#endif
-#if defined(AIO_ENABLED)
+#else
 	.aio_read = ocfs_aio_read,
 	.aio_write = ocfs_aio_write,
 #endif

Modified: trunk/fs/ocfs2/inode.h
===================================================================
--- trunk/fs/ocfs2/inode.h	2005-01-21 23:24:41 UTC (rev 1830)
+++ trunk/fs/ocfs2/inode.h	2005-01-22 01:47:41 UTC (rev 1831)
@@ -46,9 +46,7 @@
 int ocfs_mark_inode_dirty(ocfs_journal_handle *handle, 
 			  struct inode *inode, 
 			  struct buffer_head *bh);
-#ifdef AIO_ENABLED
 int ocfs_aio_read(struct file *file, struct kiocb *req, struct iocb *iocb);
 int ocfs_aio_write(struct file *file, struct kiocb *req, struct iocb *iocb);
-#endif
 
 #endif /* OCFS2_INODE_H */