[Libsysio-commit] strided-io: libsysio/drivers/native fs_native.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/drivers/native
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2483

Modified Files:
      Tag: strided-io
	fs_native.c 
Log Message:


Ifdef'd out the locking code. It's inapprorpiate and problematic.
Good riidance.


Index: fs_native.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v
retrieving revision 1.25.6.8
retrieving revision 1.25.6.9
diff -u -w -b -B -p -r1.25.6.8 -r1.25.6.9
--- fs_native.c	30 Jan 2004 19:55:33 -0000	1.25.6.8
+++ fs_native.c	3 Feb 2004 18:32:49 -0000	1.25.6.9
@@ -1256,6 +1256,7 @@ doiov(const struct iovec *iov,
 #endif
 }
 
+#if 0
 static int
 lockop_all(struct native_inode *nino,
 	   struct intnl_xtvec *xtv,
@@ -1300,19 +1301,25 @@ order_xtv(const struct intnl_xtvec *xtv1
 		return 1;
 	return 0;
 }
+#endif
 
 static int
 doio(char op, struct ioctx *ioctx)
 {
 	struct native_inode *nino;
+#if 0
 	int	dolocks;
 	struct intnl_xtvec *oxtv;
 	int	err;
+#endif
 	struct native_io arguments;
 	ssize_t	cc;
+#if 0
 	struct intnl_xtvec *front, *rear, tmp;
+#endif
 
 	nino = I2NI(ioctx->ioctx_ino);
+#if 0
 	dolocks = ioctx->ioctx_xtvlen > 1 && nino->ni_seekok;
 	if (dolocks) {
 		/*
@@ -1338,6 +1345,7 @@ doio(char op, struct ioctx *ioctx)
 			return err;
 		}
 	}
+#endif
 	arguments.nio_op = op;
 	arguments.nio_nino = nino;
 	cc =
@@ -1349,6 +1357,7 @@ doio(char op, struct ioctx *ioctx)
 						  ssize_t,
 						  void *))doiov,
 				     &arguments);
+#if 0
 	if (dolocks) {
 		/*
 		 * Must unlock in reverse order.
@@ -1364,6 +1373,7 @@ doio(char op, struct ioctx *ioctx)
 			abort();
 		free(oxtv);
 	}
+#endif
 	if ((ioctx->ioctx_cc = cc) < 0) {
 		ioctx->ioctx_errno = -ioctx->ioctx_cc;
 		ioctx->ioctx_cc = -1;