[Ocfs2-commits] manish commits r1828 - in trunk/fs/ocfs2: . cluster

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-21 17:15:41 -0600 (Fri, 21 Jan 2005)
New Revision: 1828

Modified:
   trunk/fs/ocfs2/cluster/cl_compat.h
   trunk/fs/ocfs2/ocfs_compat.h
Log:
Remove ocfs_task_interruptible, update compat definition of dequeue_signal_lock


Modified: trunk/fs/ocfs2/cluster/cl_compat.h
===================================================================
--- trunk/fs/ocfs2/cluster/cl_compat.h	2005-01-21 23:09:00 UTC (rev 1827)
+++ trunk/fs/ocfs2/cluster/cl_compat.h	2005-01-21 23:15:41 UTC (rev 1828)
@@ -58,19 +58,8 @@
 #define INIT_WORK(w, f, d)	INIT_TQUEUE(w, f, d)
 #define schedule_work(w)	schedule_task(w)
 
-#if 1
-static inline void dequeue_signal_lock(struct task_struct *task,
-				       sigset_t *blocked, siginfo_t *info)
-{
-	spin_lock_irq(&task->sighand->siglock);
-	dequeue_signal(blocked, info);
-	spin_unlock_irq(&task->sighand->siglock);
-}
-#endif
 #define kstatfs statfs
 
-
-
 /*
  * Copied right out of the 2.6.2 kernel's buffer_head.h:
  * macro tricks to expand the set_buffer_foo(), clear_buffer_foo()

Modified: trunk/fs/ocfs2/ocfs_compat.h
===================================================================
--- trunk/fs/ocfs2/ocfs_compat.h	2005-01-21 23:09:00 UTC (rev 1827)
+++ trunk/fs/ocfs2/ocfs_compat.h	2005-01-21 23:15:41 UTC (rev 1828)
@@ -99,29 +99,18 @@
 #define filemap_fdatawrite(mapping) \
 	filemap_fdatasync(mapping);
 
-#if 1
-static inline void dequeue_signal_lock(struct task_struct *task,
-				       sigset_t *blocked, siginfo_t *info)
+static inline int dequeue_signal_lock(struct task_struct *tsk,
+				      sigset_t *mask, siginfo_t *info)
 {
-	spin_lock_irq(&task->sighand->siglock);
-	dequeue_signal(blocked, info);
-	spin_unlock_irq(&task->sighand->siglock);
-}
-static inline int ocfs_task_interruptible(void)
-{
 	unsigned long flags;
-	int ret = 0;
+	int ret;
 
-	if (signal_pending(current)) {
-		spin_lock_irqsave(&(current->sighand->siglock), flags);
-		if (sigismember(&(current->pending.signal), SIGKILL) ||
-		    sigismember(&(current->pending.signal), SIGINT))
-			ret = 1;
-		spin_unlock_irqrestore(&current->sighand->siglock, flags);
-	}
+	spin_lock_irqsave(&tsk->sighand->siglock, flags);
+	ret = dequeue_signal(mask, info);
+	spin_unlock_irqrestore(&tsk->sighand->siglock, flags);
+
 	return ret;
 }
-#endif
 
 static inline dev_t huge_decode_dev(u64 val)
 {
@@ -154,20 +143,6 @@
 
 #define ocfs_get_seconds(t) ((t).tv_sec)
 
-static inline int ocfs_task_interruptible(void)
-{
-	unsigned long flags;
-	int ret = 0;
-
-	if (signal_pending(current)) {
-		spin_lock_irqsave(&(current->sighand->siglock), flags);
-		if (sigismember(&(current->pending.signal), SIGKILL) ||
-		    sigismember(&(current->pending.signal), SIGINT))
-			ret = 1;
-		spin_unlock_irqrestore(&current->sighand->siglock, flags);
-	}
-	return ret;
-}
 #endif  /* LINUX_VERSION_CODE < 2.6 */
 
 #ifndef BITS_TO_LONGS