[Ocfs2-commits] manish commits r1003 - in branches/format-changes/src: . inc

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-04 16:51:21 -0500 (Fri, 04 Jun 2004)
New Revision: 1003

Modified:
   branches/format-changes/src/hash.c
   branches/format-changes/src/inc/ocfs_compat.h
Log:
io_schedule compat define. From Christoph Hellwig.


Modified: branches/format-changes/src/hash.c
===================================================================
--- branches/format-changes/src/hash.c	2004-06-04 17:21:17 UTC (rev 1002)
+++ branches/format-changes/src/hash.c	2004-06-04 21:51:21 UTC (rev 1003)
@@ -536,11 +536,7 @@
 #endif
 		if (!do_timeout) {
 			set_task_state(tsk, TASK_UNINTERRUPTIBLE);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 			io_schedule();
-#else
-			schedule();
-#endif
 		} else {
 			do_timeout = 0;
 			set_task_state(tsk, TASK_INTERRUPTIBLE);

Modified: branches/format-changes/src/inc/ocfs_compat.h
===================================================================
--- branches/format-changes/src/inc/ocfs_compat.h	2004-06-04 17:21:17 UTC (rev 1002)
+++ branches/format-changes/src/inc/ocfs_compat.h	2004-06-04 21:51:21 UTC (rev 1003)
@@ -57,6 +57,10 @@
 #define unlock_page(p)         UnlockPage(p)
 #endif
 
+#if !defined(RED_HAT_LINUX_KERNEL) || LINUX_VERSION_CODE < KERNEL_VERSION(2,4,21)
+#define io_schedule            schedule
+#endif
+
 static inline dev_t ocfs_decode_dev(u64 val)
 {
 	u16 val16 = (u16)(val & 0xFFFFULL);