b=22455 remove "lnet." prefix from lctl params display

remove "lnet." prefix from lctl params display and change one
"memused" to "lnet_memused".

o=adilger
i=johann
i=emoly.liu
i=rread

diff --git a/libcfs/libcfs/linux/linux-proc.c b/libcfs/libcfs/linux/linux-proc.c
index 06c7593..4efd8dc 100644 (file)
--- a/libcfs/libcfs/linux/linux-proc.c
+++ b/libcfs/libcfs/linux/linux-proc.c
@@ -426,7 +426,7 @@ static cfs_sysctl_table_t lnet_table[] = {
         },
         {
                 .ctl_name = PSDEV_LNET_MEMUSED,
         },
         {
                 .ctl_name = PSDEV_LNET_MEMUSED,

-                .procname = "memused",
+                .procname = "lnet_memused",

                 .data     = (int *)&libcfs_kmemory.counter,
                 .maxlen   = sizeof(int),
                 .mode     = 0444,
                 .data     = (int *)&libcfs_kmemory.counter,
                 .maxlen   = sizeof(int),
                 .mode     = 0444,

diff --git a/lustre/utils/lustre_cfg.c b/lustre/utils/lustre_cfg.c
index 6860502..4b527d0 100644 (file)
--- a/lustre/utils/lustre_cfg.c
+++ b/lustre/utils/lustre_cfg.c
@@ -570,6 +570,8 @@ static char *display_name(char *filename, int show_type)
 
         if (strncmp(filename, "lustre/", strlen("lustre/")) == 0)
                 filename += strlen("lustre/");
 
         if (strncmp(filename, "lustre/", strlen("lustre/")) == 0)
                 filename += strlen("lustre/");

+        else if (strncmp(filename, "lnet/", strlen("lnet/")) == 0)
+                filename += strlen("lnet/");

 
         /* replace '/' with '.' to match conf_param and sysctl */
         tmp = filename;
 
         /* replace '/' with '.' to match conf_param and sysctl */
         tmp = filename;