[Ocfs2-commits] jlbec commits r1802 - in trunk: . src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-01-20 12:59:17 -0600 (Thu, 20 Jan 2005)
New Revision: 1802

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/src/
   trunk/src/24io.c
   trunk/src/Makefile
Log:

o Remove 'SUSE' stuff, as we don't support SLES8 anymore.
o Remove KERNEL_NO_F_IOBUF, we've only been using our own iobuf for
  a while.



Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-01-20 18:02:36 UTC (rev 1801)
+++ trunk/Config.make.in	2005-01-20 18:59:17 UTC (rev 1802)
@@ -43,8 +43,6 @@
 
 KERNEL_26 = @KERNEL_26@
 
-SUSE_KERNEL = @SUSE_KERNEL@
-
 KERNELDIR = @KERNELDIR@
 KERNELINC = $(KERNELDIR)/include
 KERNELVER = @KERNELVER@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-01-20 18:02:36 UTC (rev 1801)
+++ trunk/configure.in	2005-01-20 18:59:17 UTC (rev 1802)
@@ -232,11 +232,6 @@
 KVER=
 AC_SUBST(KVER)
 
-if test "x$ulkernel" = "xyes"; then
-  SUSE_KERNEL=yes
-  AC_SUBST(SUSE_KERNEL)
-fi
-
 AC_MSG_CHECKING([whether to build aio])
 if test "x$OCFS_AIO" = "xyes"; then
   if test "x$KERNEL_26" = "xyes"; then


Property changes on: trunk/src
___________________________________________________________________
Name: svn:ignore
   - cscope*
stamp-md5
.*.sw?
.*.cmd
*.ko
ocfs2.mod.c
.tmp_versions

   + cscope*
stamp-md5
.*.sw?
.*.cmd
*.ko
ocfs2.mod.c
.tmp_versions
.*.d


Modified: trunk/src/24io.c
===================================================================
--- trunk/src/24io.c	2005-01-20 18:02:36 UTC (rev 1801)
+++ trunk/src/24io.c	2005-01-20 18:59:17 UTC (rev 1802)
@@ -27,7 +27,6 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 
-#define KERNEL_NO_F_IOBUF
 #include "ocfs_compat.h"
 
 #include <linux/fs.h>
@@ -44,10 +43,6 @@
 
 #define OCFS_DEBUG_CONTEXT    OCFS_DEBUG_CONTEXT_INODE
 
-#ifdef SUSE
-#define KERNEL_NO_F_IOBUF 1
-#endif
-
 static int ocfs_get_sector(struct inode *inode, unsigned long isector,
                            unsigned long *osector)
 {
@@ -98,12 +93,7 @@
  */
 ssize_t ocfs_rw_direct (int rw, struct file *filp, char *buf, size_t size, loff_t * offp)
 {
-#ifdef KERNEL_NO_F_IOBUF
 	struct kiobuf *iobuf;
-#else
-	struct kiobuf *iobuf = filp->f_iobuf;
-	int new_iobuf = 0;
-#endif
 	int err = 0;
 	unsigned long blocknr, blocks, myiosize;
 	size_t transferred;
@@ -237,24 +227,9 @@
 		if (nbhs > max_sectors)
 			nbhs = max_sectors;
 
-#ifdef KERNEL_NO_F_IOBUF
 		err = alloc_kiovec(1, &iobuf);
 		if (err)
 			goto out;
-#else
-		if (test_and_set_bit(0, &filp->f_iobuf_lock)) {
-			/*
-			* A parallel read/write is using the preallocated iobuf
-			* so just run slow and allocate a new one.
-			*/
-			err = alloc_kiovec(1, &iobuf);
-			if (err)
-				goto out;
-			new_iobuf = 1;
-		} else
-			new_iobuf = 0;
-				
-#endif
 		inuse = 1;
 
 		totalioblocks = 0;
@@ -296,10 +271,9 @@
 			}
 			err = brw_kiovec(rw, 1, &iobuf, inode->i_dev, iobuf->blocks,
 					large_io ? PAGE_SIZE : sector_size);
-#ifdef SUSE
 			if (rw == READ &&  err > 0)
 				mark_dirty_kiobuf(iobuf, err);
-#endif
+
 			if (err >= 0) {
 				transferred += err;
 				size -= err;
@@ -318,14 +292,7 @@
 			if (err != iosize)
 				break;
 		}
-#ifdef KERNEL_NO_F_IOBUF
 		free_kiovec(1, &iobuf);
-#else
-		if (!new_iobuf)
-			clear_bit(0, &filp->f_iobuf_lock);
-		else
-			free_kiovec(1, &iobuf);
-#endif
 		inuse = 0;
 		totalioblocks = 0;
 		firstlogic = nextlogic;
@@ -337,17 +304,8 @@
 	}
 
 out:
-#ifdef KERNEL_NO_F_IOBUF
 	if (inuse)
 	   free_kiovec(1, &iobuf);
-#else
-	if (inuse) {
-		if (!new_iobuf)
-			clear_bit(0, &filp->f_iobuf_lock);
-		else
-			free_kiovec(1, &iobuf);
-	}
-#endif
 	return err;
 }				/* ocfs_rw_direct */
 

Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2005-01-20 18:02:36 UTC (rev 1801)
+++ trunk/src/Makefile	2005-01-20 18:59:17 UTC (rev 1802)
@@ -42,10 +42,6 @@
 MODULE_DEFINES += -DOCFS_COMPAT_SAFE_WRITE
 endif
 
-ifdef SUSE_KERNEL
-MODULE_DEFINES += -DSUSE
-endif
-
 ifneq ($(QUIET),1)
 MODULE_DEFINES += -DVERBOSE_BH_JBD_TRACE
 MODULE_DEFINES += -DVERBOSE_LOCKING_TRACE