make the portals' definition of USERMODEHELPER blocking, too.

diff --git a/lnet/include/linux/kernel_compat.h b/lnet/include/linux/kernel_compat.h
index 6893c40..3037daa 100644 (file)
--- a/lnet/include/linux/kernel_compat.h
+++ b/lnet/include/linux/kernel_compat.h
@@ -12,7 +12,7 @@
 #define SIGNAL_MASK_UNLOCK(task, flags)       \
         spin_unlock_irqrestore(&task->sighand->siglock, flags)
 #define USERMODEHELPER(path, argv, envp)       \
-        call_usermodehelper(path, argv, envp, 0)
+        call_usermodehelper(path, argv, envp, 1)
 #define RECALC_SIGPENDING       recalc_sigpending
 #define CURRENT_SECONDS         get_seconds()
 

diff --git a/lustre/portals/include/linux/kernel_compat.h b/lustre/portals/include/linux/kernel_compat.h
index 6893c40..3037daa 100644 (file)
--- a/lustre/portals/include/linux/kernel_compat.h
+++ b/lustre/portals/include/linux/kernel_compat.h
@@ -12,7 +12,7 @@
 #define SIGNAL_MASK_UNLOCK(task, flags)       \
         spin_unlock_irqrestore(&task->sighand->siglock, flags)
 #define USERMODEHELPER(path, argv, envp)       \
-        call_usermodehelper(path, argv, envp, 0)
+        call_usermodehelper(path, argv, envp, 1)
 #define RECALC_SIGPENDING       recalc_sigpending
 #define CURRENT_SECONDS         get_seconds()