[Cluster-devel] cluster/gfs-kernel/src/gfs ops_address.c ops_f ...

[Cluster-devel] cluster/gfs-kernel/src/gfs ops_address.c ops_f ...

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2007-07-13 15:19:17

Modified files:
	gfs-kernel/src/gfs: ops_address.c ops_file.c 

Log message:
	Make gfs-kernel compile against post-2.6.22 (2.6.23-rc) kernels.
	(No more sendfile which is now done via splice which gfs1 still lacks.)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ops_address.c.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ops_file.c.diff?cvsroot=cluster&r1=1.35&r2=1.36

--- cluster/gfs-kernel/src/gfs/ops_address.c	2006/10/15 06:32:06	1.14
+++ cluster/gfs-kernel/src/gfs/ops_address.c	2007/07/13 15:19:16	1.15
@@ -447,7 +447,7 @@
  * Returns: errno
  */
 
-static int
+static ssize_t
 gfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
 	      loff_t offset, unsigned long nr_segs)
 {
--- cluster/gfs-kernel/src/gfs/ops_file.c	2007/06/17 03:35:02	1.35
+++ cluster/gfs-kernel/src/gfs/ops_file.c	2007/07/13 15:19:16	1.36
@@ -1597,6 +1597,7 @@
 		return gfs_lm_plock(sdp, &name, file, cmd, fl);
 }
 
+#if 0
 /**
  * gfs_sendfile - Send bytes to a file or socket
  * @in_file: The file to read from
@@ -1636,6 +1637,7 @@
 
 	return retval;
 }
+#endif
 
 /**
  * do_flock - Acquire a flock on a file
@@ -1761,7 +1763,7 @@
 	.release = gfs_close,
 	.fsync = gfs_fsync,
 	.lock = gfs_lock,
-	.sendfile = gfs_sendfile,
+	/* .sendfile = gfs_sendfile, */
 	.flock = gfs_flock,
 };