[PATCH v2 22/25] staging: lustre: libcfs: update debug messages in CPT code
From: Dmitry Eremin
Update the debug messages for the CPT table creation code. Place
the passed in string in quotes to make it clear what it is.
Captialize cpu in the debug strings.
Signed-off-by: Dmitry Eremin
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8703
Reviewed-on: https://review.whamcloud.com/23306
Reviewed-by: James Simmons
Reviewed-by: Andreas Dilger
Reviewed-by: Patrick Farrell
Reviewed-by: Olaf Weber
Reviewed-by: Oleg Drokin
Signed-off-by: James Simmons
---
Changelog:
v1) Initial patch
v2) Rebased patch. No changes in code from earlier patch
drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
index 0fc102c..649f7f9 100644
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
@@ -496,7 +496,7 @@ void cfs_cpt_unset_cpu(struct cfs_cpt_table *cptab, int
cpt, int cpu)
} else if (cpt != cptab->ctb_cpu2cpt[cpu]) {
CDEBUG(D_INFO,
- "CPU %d is not in cpu-partition %d\n", cpu, cpt);
+ "CPU %d is not in CPU partition %d\n", cpu, cpt);
return;
}
@@ -940,14 +940,14 @@ static struct cfs_cpt_table
*cfs_cpt_table_create_pattern(char *pattern)
if (!ncpt ||
(node && ncpt > num_online_nodes()) ||
(!node && ncpt > num_online_cpus())) {
- CERROR("Invalid pattern %s, or too many partitions %d\n",
+ CERROR("Invalid pattern '%s', or too many partitions %d\n",
pattern, ncpt);
return NULL;
}
cptab = cfs_cpt_table_alloc(ncpt);
if (!cptab) {
- CERROR("Failed to allocate cpu partition table\n");
+ CERROR("Failed to allocate CPU partition table\n");
return NULL;
}
@@ -978,11 +978,11 @@ static struct cfs_cpt_table
*cfs_cpt_table_create_pattern(char *pattern)
if (!bracket) {
if (*str) {
- CERROR("Invalid pattern %s\n", str);
+ CERROR("Invalid pattern '%s'\n", str);
goto failed;
}
if (c != ncpt) {
- CERROR("expect %d partitions but found %d\n",
+ CERROR("Expect %d partitions but found %d\n",
ncpt, c);
goto failed;
}
@@ -990,7 +990,7 @@ static struct cfs_cpt_table
*cfs_cpt_table_create_pattern(char *pattern)
}
if (sscanf(str, "%d%n", , ) < 1) {
- CERROR("Invalid cpu pattern %s\n", str);
+ CERROR("Invalid CPU pattern '%s'\n", str);
goto failed;
}
@@ -1007,20 +1007,20 @@ static struct cfs_cpt_table
*cfs_cpt_table_create_pattern(char *pattern)
str = strim(str + n);
if (str != bracket) {
- CERROR("Invalid pattern %s\n", str);
+ CERROR("Invalid pattern '%s'\n", str);
goto failed;
}
bracket = strchr(str, ']');
if (!bracket) {
- CERROR("Missing right bracket for partition %d, %s\n",
+ CERROR("Missing right bracket for partition %d in
'%s'\n",
cpt, str);
goto failed;
}
if (cfs_expr_list_parse(str, (bracket - str) + 1,
0, high, )) {
- CERROR("Can't parse number range: %s\n", str);
+ CERROR("Can't parse number range in '%s'\n", str);
goto failed;
}
--
1.8.3.1
[PATCH v2 22/25] staging: lustre: libcfs: update debug messages in CPT code
From: Dmitry Eremin
Update the debug messages for the CPT table creation code. Place
the passed in string in quotes to make it clear what it is.
Captialize cpu in the debug strings.
Signed-off-by: Dmitry Eremin
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8703
Reviewed-on: https://review.whamcloud.com/23306
Reviewed-by: James Simmons
Reviewed-by: Andreas Dilger
Reviewed-by: Patrick Farrell
Reviewed-by: Olaf Weber
Reviewed-by: Oleg Drokin
Signed-off-by: James Simmons
---
Changelog:
v1) Initial patch
v2) Rebased patch. No changes in code from earlier patch
drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
index 0fc102c..649f7f9 100644
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
@@ -496,7 +496,7 @@ void cfs_cpt_unset_cpu(struct cfs_cpt_table *cptab, int
cpt, int cpu)
} else if (cpt != cptab->ctb_cpu2cpt[cpu]) {
CDEBUG(D_INFO,
- "CPU %d is not in cpu-partition %d\n", cpu, cpt);
+ "CPU %d is not in CPU partition %d\n", cpu, cpt);
return;
}
@@ -940,14 +940,14 @@ static struct cfs_cpt_table
*cfs_cpt_table_create_pattern(char *pattern)
if (!ncpt ||
(node && ncpt > num_online_nodes()) ||
(!node && ncpt > num_online_cpus())) {
- CERROR("Invalid pattern %s, or too many partitions %d\n",
+ CERROR("Invalid pattern '%s', or too many partitions %d\n",
pattern, ncpt);
return NULL;
}
cptab = cfs_cpt_table_alloc(ncpt);
if (!cptab) {
- CERROR("Failed to allocate cpu partition table\n");
+ CERROR("Failed to allocate CPU partition table\n");
return NULL;
}
@@ -978,11 +978,11 @@ static struct cfs_cpt_table
*cfs_cpt_table_create_pattern(char *pattern)
if (!bracket) {
if (*str) {
- CERROR("Invalid pattern %s\n", str);
+ CERROR("Invalid pattern '%s'\n", str);
goto failed;
}
if (c != ncpt) {
- CERROR("expect %d partitions but found %d\n",
+ CERROR("Expect %d partitions but found %d\n",
ncpt, c);
goto failed;
}
@@ -990,7 +990,7 @@ static struct cfs_cpt_table
*cfs_cpt_table_create_pattern(char *pattern)
}
if (sscanf(str, "%d%n", , ) < 1) {
- CERROR("Invalid cpu pattern %s\n", str);
+ CERROR("Invalid CPU pattern '%s'\n", str);
goto failed;
}
@@ -1007,20 +1007,20 @@ static struct cfs_cpt_table
*cfs_cpt_table_create_pattern(char *pattern)
str = strim(str + n);
if (str != bracket) {
- CERROR("Invalid pattern %s\n", str);
+ CERROR("Invalid pattern '%s'\n", str);
goto failed;
}
bracket = strchr(str, ']');
if (!bracket) {
- CERROR("Missing right bracket for partition %d, %s\n",
+ CERROR("Missing right bracket for partition %d in
'%s'\n",
cpt, str);
goto failed;
}
if (cfs_expr_list_parse(str, (bracket - str) + 1,
0, high, )) {
- CERROR("Can't parse number range: %s\n", str);
+ CERROR("Can't parse number range in '%s'\n", str);
goto failed;
}
--
1.8.3.1
