|
@@ -69,10 +69,11 @@ void libcfs_run_debug_log_upcall(char *file)
|
|
|
{
|
|
|
char *argv[3];
|
|
|
int rc;
|
|
|
- char *envp[] = {
|
|
|
+ static const char * const envp[] = {
|
|
|
"HOME=/",
|
|
|
"PATH=/sbin:/bin:/usr/sbin:/usr/bin",
|
|
|
- NULL};
|
|
|
+ NULL
|
|
|
+ };
|
|
|
|
|
|
argv[0] = lnet_debug_log_upcall;
|
|
|
|
|
@@ -81,7 +82,7 @@ void libcfs_run_debug_log_upcall(char *file)
|
|
|
|
|
|
argv[2] = NULL;
|
|
|
|
|
|
- rc = call_usermodehelper(argv[0], argv, envp, 1);
|
|
|
+ rc = call_usermodehelper(argv[0], argv, (char **)envp, 1);
|
|
|
if (rc < 0 && rc != -ENOENT) {
|
|
|
CERROR("Error %d invoking LNET debug log upcall %s %s; check /sys/kernel/debug/lnet/debug_log_upcall\n",
|
|
|
rc, argv[0], argv[1]);
|
|
@@ -95,10 +96,11 @@ void libcfs_run_upcall(char **argv)
|
|
|
{
|
|
|
int rc;
|
|
|
int argc;
|
|
|
- char *envp[] = {
|
|
|
+ static const char * const envp[] = {
|
|
|
"HOME=/",
|
|
|
"PATH=/sbin:/bin:/usr/sbin:/usr/bin",
|
|
|
- NULL};
|
|
|
+ NULL
|
|
|
+ };
|
|
|
|
|
|
argv[0] = lnet_upcall;
|
|
|
argc = 1;
|
|
@@ -107,7 +109,7 @@ void libcfs_run_upcall(char **argv)
|
|
|
|
|
|
LASSERT(argc >= 2);
|
|
|
|
|
|
- rc = call_usermodehelper(argv[0], argv, envp, 1);
|
|
|
+ rc = call_usermodehelper(argv[0], argv, (char **)envp, 1);
|
|
|
if (rc < 0 && rc != -ENOENT) {
|
|
|
CERROR("Error %d invoking LNET upcall %s %s%s%s%s%s%s%s%s; check /sys/kernel/debug/lnet/upcall\n",
|
|
|
rc, argv[0], argv[1],
|