From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933151AbcKQTiW (ORCPT ); Thu, 17 Nov 2016 14:38:22 -0500 Received: from [160.91.203.11] ([160.91.203.11]:56934 "EHLO smtp2.ccs.ornl.gov" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S932533AbcKQTiU (ORCPT ); Thu, 17 Nov 2016 14:38:20 -0500 From: James Simmons To: Greg Kroah-Hartman , devel@driverdev.osuosl.org, Andreas Dilger , Oleg Drokin Cc: Linux Kernel Mailing List , Lustre Development List , James Simmons Subject: [PATCH 15/19] staging: lustre: libcfs: Make char * array envp static constant Date: Thu, 17 Nov 2016 14:35:53 -0500 Message-Id: <1479411357-28979-16-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1479411357-28979-1-git-send-email-jsimmons@infradead.org> References: <1479411357-28979-1-git-send-email-jsimmons@infradead.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The envp char array can be made static constant. Signed-off-by: James Simmons --- .../staging/lustre/lnet/libcfs/linux/linux-debug.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c index 8d37938..d8a9894 100644 --- a/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c +++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c @@ -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], -- 1.7.1