[Ocfs2-commits] rev 747 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-02 16:11:13 -0600 (Tue, 02 Mar 2004)
New Revision: 747

Modified:
   trunk/src/io.c
Log:
* add a patch by Rusty Lynch <rusty at linux.co.intel.com>:

The following patch ports io.c to a 2.6 kernel by replacing
mark_buffer_clean() calls with clear_buffer_dirty().  As I
commented below, I'm not sure this is the correct thing to
do.



Modified: trunk/src/io.c
===================================================================
--- trunk/src/io.c	2004-03-02 22:00:35 UTC (rev 746)
+++ trunk/src/io.c	2004-03-02 22:11:13 UTC (rev 747)
@@ -277,7 +277,17 @@
 		set_buffer_uptodate(bh);
 
 		/* remove from dirty list before I/O. */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)		
+		/*
+		 * mark_buffer_clean() doesn't exist in 2.6.x kernels.
+		 * Not many places actually used mark_buffer_clean, but
+		 * at least reiserfs uses clear_buffer_dirty() as
+		 * a replacment.
+		 */
+		clear_buffer_dirty(bh);
+#else
 		mark_buffer_clean(bh);
+#endif
 
 		bh->b_end_io = ocfs_end_buffer_io_sync;
 		submit_bh(WRITE, bh);
@@ -550,7 +560,17 @@
 
 		set_buffer_uptodate(bh);
 		/* remove from dirty list before I/O. */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)		
+		/*
+		 * mark_buffer_clean() doesn't exist in 2.6.x kernels.
+		 * Not many places actually used mark_buffer_clean, but
+		 * at least reiserfs uses clear_buffer_dirty() as
+		 * a replacment.
+		 */
+		clear_buffer_dirty(bh);
+#else
 		mark_buffer_clean(bh);
+#endif
 
 		bh->b_end_io = ocfs_end_buffer_io_sync;
 		submit_bh(WRITE, bh);