[Ocfs2-commits] mfasheh commits r821 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-29 18:29:35 -0600 (Mon, 29 Mar 2004)
New Revision: 821

Modified:
   trunk/src/journal.c
Log:
* include a patch by Rusty Lynch <rusty at linux.co.intel.com> to fix
  some bone headed NPTL breakage I put in a previous commit.



Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c	2004-03-29 23:04:14 UTC (rev 820)
+++ trunk/src/journal.c	2004-03-30 00:29:35 UTC (rev 821)
@@ -1771,18 +1771,24 @@
 				if (journal->state == OCFS_JOURNAL_IN_SHUTDOWN)
 					finish = 1;
 				if (signal_pending(current)) {
+					/* ignore the actual signal */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-					/* ignore the actual signal */
 					dequeue_signal_lock(current, 
 							    &current->blocked, 
 							    &info);
 #else
+#ifdef HAVE_NPTL
+					spin_lock_irq (&current->sighand->siglock);
+					dequeue_signal(&current->blocked, 
+						       &info);
+					spin_unlock_irq(&current->sighand->siglock);					
+#else 
 					spin_lock_irq(&current->sigmask_lock);
-					/* ignore the actual signal */
 					dequeue_signal(&current->blocked, 
 						       &info);
 					spin_unlock_irq(&current->sigmask_lock);
-#endif
+#endif /* !HAVE_NPTL */
+#endif /* 2.4.x kernel */
 				}
 				LOG_TRACE_STR("FLUSH_EVENT: interrupted");
 				break;