land b_md onto HEAD. almost entirely small cleanups and miscellaneous fixes,

[fs/lustre-release.git] / lustre / ldlm / ldlm_test.c

diff --git a/lustre/ldlm/ldlm_test.c b/lustre/ldlm/ldlm_test.c
index fa387a0..ce7a73d 100644 (file)
--- a/lustre/ldlm/ldlm_test.c
+++ b/lustre/ldlm/ldlm_test.c
@@ -436,14 +436,15 @@ static int ldlm_test_main(void *data)
 
         lock_kernel();
         daemonize();
-        spin_lock_irq(&current->sigmask_lock);
-        sigfillset(&current->blocked);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+        sigfillset(&current->blocked);
         recalc_sigpending();
 #else
+        spin_lock_irq(&current->sigmask_lock);
+        sigfillset(&current->blocked);
         recalc_sigpending(current);
-#endif
         spin_unlock_irq(&current->sigmask_lock);
+#endif
 
         sprintf(current->comm, "ldlm_test");
         unlock_kernel();