[Pvfs2-cvs] commit by pcarns in pvfs2-1/src/kernel/linux-2.6: file.c

CVS commit program cvs at parl.clemson.edu
Wed Jun 4 17:23:29 EDT 2008


Update of /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6
In directory parlweb1:/tmp/cvs-serv17166/src/kernel/linux-2.6

Modified Files:
	file.c 
Log Message:
make --disable-kernel-aio compile properly.  According to email archives,
Troy Benjegerdes actually reported this and provided a patch a long time ago:

http://www.beowulf-underground.org/pipermail/pvfs2-developers/2007-February/003211.html


Index: file.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/file.c,v
diff -p -u -r1.147 -r1.148
--- file.c	11 Apr 2008 18:53:42 -0000	1.147
+++ file.c	4 Jun 2008 21:23:28 -0000	1.148
@@ -3259,8 +3259,10 @@ struct file_operations pvfs2_file_operat
     .write = pvfs2_file_write,
 #ifdef HAVE_COMBINED_AIO_AND_VECTOR
     /* for >= 2.6.19 */
+#ifdef HAVE_AIO_VFS_SUPPORT
     .aio_read = pvfs2_file_aio_read_iovec,
     .aio_write = pvfs2_file_aio_write_iovec,
+#endif
     .lock = pvfs2_lock,
 #else
     .readv = pvfs2_file_readv,



More information about the Pvfs2-cvs mailing list