Use compat. macros to fix building w/ rh-2.4.20 series.

r=phil

diff --git a/lustre/osc/osc_rpcd.c b/lustre/osc/osc_rpcd.c
index f77e554..9ab633c 100644 (file)
--- a/lustre/osc/osc_rpcd.c
+++ b/lustre/osc/osc_rpcd.c
@@ -136,15 +136,11 @@ static int osc_rpcd(void *arg)
         ENTRY;
 
         kportal_daemonize("liod_writeback");
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-        sigfillset(&current->blocked);
-        recalc_sigpending();
-#else
-        spin_lock_irqsave(&current->sigmask_lock, flags);
+
+        SIGNAL_MASK_LOCK(current, flags);
         sigfillset(&current->blocked);
-        recalc_sigpending(current);
-        spin_unlock_irqrestore(&current->sigmask_lock, flags);
-#endif
+        RECALC_SIGPENDING;
+        SIGNAL_MASK_UNLOCK(current, flags);
 
         complete(&orc->orc_starting);