-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
int lcfg_set_devname(char *name)
{
+ char *ptr;
+ int digit = 1;
+
if (name) {
if (lcfg_devname)
free(lcfg_devname);
/* quietly strip the unnecessary '$' */
if (*name == '$' || *name == '%')
name++;
- if (isdigit(*name)) {
+
+ ptr = name;
+ while (*ptr != '\0') {
+ if (!isdigit(*ptr)) {
+ digit = 0;
+ break;
+ }
+ ptr++;
+ }
+
+ if (digit) {
/* We can't translate from dev # to name */
lcfg_devname = NULL;
} else {
}
}
+/* Supporting file paths creates perilous behavoir: LU-888.
+ * Path support is deprecated.
+ * If a path is supplied it must begin with /proc. */
+static void lprocfs_param_pattern(const char *cmd, const char *path, char *buf,
+ size_t buf_size)
+{
+ /* test path to see if it begins with '/proc/' */
+ if (strncmp(path, "/proc/", strlen("/proc/")) == 0) {
+ static int warned;
+ if (!warned) {
+ fprintf(stderr, "%s: specifying parameters via "
+ "full paths is deprecated.\n", cmd);
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2,6,50,0)
+#warning "remove deprecated full path tunable access"
+#endif
+ warned = 1;
+ }
+ snprintf(buf, buf_size, "%s", path);
+ } else {
+ snprintf(buf, buf_size, "/proc/{fs,sys}/{lnet,lustre}/%s",
+ path);
+ }
+}
+
struct param_opts {
int only_path:1;
int show_path:1;
int jt_lcfg_listparam(int argc, char **argv)
{
- int fp;
int rc = 0, i;
struct param_opts popt;
char pattern[PATH_MAX];
clean_path(path);
- /* If the entire path is specified as input */
- fp = open(path, O_RDONLY);
- if (fp < 0) {
- snprintf(pattern, PATH_MAX, "/proc/{fs,sys}/{lnet,lustre}/%s",
- path);
- } else {
- strcpy(pattern, path);
- close(fp);
- }
+ lprocfs_param_pattern(argv[0], path, pattern, sizeof(pattern));
rc = listparam_display(&popt, pattern);
if (rc < 0)
int jt_lcfg_getparam(int argc, char **argv)
{
- int fp;
int rc = 0, i;
struct param_opts popt;
char pattern[PATH_MAX];
if (rc < 0 || rc >= argc)
return CMD_HELP;
- for (i = rc; i < argc; i++) {
- path = argv[i];
+ for (i = rc, rc = 0; i < argc; i++) {
+ int rc2;
- clean_path(path);
+ path = argv[i];
- /* If the entire path is specified as input */
- fp = open(path, O_RDONLY);
- if (fp < 0) {
- snprintf(pattern, PATH_MAX, "/proc/{fs,sys}/{lnet,lustre}/%s",
- path);
- } else {
- strcpy(pattern, path);
- close(fp);
- }
+ clean_path(path);
- if (popt.only_path)
- rc = listparam_display(&popt, pattern);
- else
- rc = getparam_display(&popt, pattern);
- if (rc < 0)
- return rc;
- }
+ lprocfs_param_pattern(argv[0], path, pattern, sizeof(pattern));
- return 0;
+ if (popt.only_path)
+ rc2 = listparam_display(&popt, pattern);
+ else
+ rc2 = getparam_display(&popt, pattern);
+ if (rc2 < 0 && rc == 0)
+ rc = rc2;
+ }
+
+ return rc;
}
static int setparam_cmdline(int argc, char **argv, struct param_opts *popt)
int jt_lcfg_setparam(int argc, char **argv)
{
- int fp;
int rc = 0, i;
struct param_opts popt;
char pattern[PATH_MAX];
if (rc < 0 || rc >= argc)
return CMD_HELP;
- for (i = rc; i < argc; i++) {
+ for (i = rc, rc = 0; i < argc; i++) {
+ int rc2;
+
if ((value = strchr(argv[i], '=')) != NULL) {
/* format: set_param a=b */
*value = '\0';
clean_path(path);
- /* If the entire path is specified as input */
- fp = open(path, O_RDONLY);
- if (fp < 0) {
- snprintf(pattern, PATH_MAX, "/proc/{fs,sys}/{lnet,lustre}/%s",
- path);
- } else {
- strcpy(pattern, path);
- close(fp);
- }
+ lprocfs_param_pattern(argv[0], path, pattern, sizeof(pattern));
- rc = setparam_display(&popt, pattern, value);
+ rc2 = setparam_display(&popt, pattern, value);
path = NULL;
value = NULL;
- if (rc < 0)
- return rc;
- }
+ if (rc2 < 0 && rc == 0)
+ rc = rc2;
+ }
- return 0;
+ return rc;
}
+