Skip to contentSkip to conversation

target: Fix a pr_debug() argument

PATCH Applied Bart Van Assche 2 participants 4 messages Nov 7, 2019 – Nov 20, 2019 SCSI target

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target: Fix a pr_debug() argument

Print the string for which conversion failed instead of printing the function name twice.

Cc Christoph Hellwig <[email protected]>
Fixes 2650d71e244f ("target: move transport ID handling to the core")
---
 drivers/target/target_core_fabric_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_fabric_lib.c +1 -1
index 3c79411c4cd0..6b4b354c88aa 100644
@@ -118,7 +118,7 @@ static int srp_get_pr_transport_id(
 	memset(buf + 8, 0, leading_zero_bytes);
 	rc = hex2bin(buf + 8 + leading_zero_bytes, p, count);
 	if (rc < 0) {
-		pr_debug("hex2bin failed for %s: %d\n", __func__, rc);
+		pr_debug("hex2bin failed for %s: %d\n", p, rc);
 		return rc;
 	}
 
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
#1 lore raw

Hi Bart!

Quoted 2 lines

Print the string for which conversion failed instead of printing the function name twice.

What do you mean wrt. printing the function name twice?

Quoted 19 lines
Cc Christoph Hellwig <[email protected]>
Fixes 2650d71e244f ("target: move transport ID handling to the core")
---
 drivers/target/target_core_fabric_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_fabric_lib.c +1 -1
index 3c79411c4cd0..6b4b354c88aa 100644
@@ -118,7 +118,7 @@ static int srp_get_pr_transport_id(
 	memset(buf + 8, 0, leading_zero_bytes);
 	rc = hex2bin(buf + 8 + leading_zero_bytes, p, count);
 	if (rc < 0) {
-		pr_debug("hex2bin failed for %s: %d\n", __func__, rc);
+		pr_debug("hex2bin failed for %s: %d\n", p, rc);
 		return rc;
 	}
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#2 lore raw
In reply to Bart Van Assche
Quoted 15 lines · Martin K. Petersen

Hi Bart!

Quoted 2 lines

Print the string for which conversion failed instead of printing the function name twice.

What do you mean wrt. printing the function name twice?

Quoted 7 lines
Cc Christoph Hellwig <[email protected]>
Fixes 2650d71e244f ("target: move transport ID handling to the core")
---
  drivers/target/target_core_fabric_lib.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 12 lines

drivers/target/target_core_fabric_lib.c static int srp_get_pr_transport_id( · line 123

Quoted 12 lines
drivers/target/target_core_fabric_lib.c +1 -1
index 3c79411c4cd0..6b4b354c88aa 100644
@@ -118,7 +118,7 @@ static int srp_get_pr_transport_id(
  	memset(buf + 8, 0, leading_zero_bytes);
  	rc = hex2bin(buf + 8 + leading_zero_bytes, p, count);
  	if (rc < 0) {
-		pr_debug("hex2bin failed for %s: %d\n", __func__, rc);
+		pr_debug("hex2bin failed for %s: %d\n", p, rc);
  		return rc;
  	}

Hi Martin,

With CONFIG_DYNAMIC_DEBUG=y, the output of pr_debug() statements is controlled by the settings in /sys/kernel/debug/dynamic_debug/control.
From Documentation/admin-guide/dynamic-debug-howto.rst:

  p    enables the pr_debug() callsite.
  f    Include the function name in the printed message
  l    Include line number in the printed message
  m    Include module name in the printed message
  t    Include thread ID in messages not generated from interrupt context
  _    No flags are set. (Or'd with others on input)

In other words, the dynamic debug infrastructure already supports printing the function name. I use the pmf flags when enabling pr_debug() statements. This is why I wrote that explicitly printing the function name causes the function name to be printed twice.

Please let me know if you need more information.

Bart.

#3 lore raw
In reply to Bart Van Assche

Bart,

Quoted 3 lines

With CONFIG_DYNAMIC_DEBUG=y, the output of pr_debug() statements is controlled by the settings in /sys/kernel/debug/dynamic_debug/control.

OK.

Applied to 5.5/scsi-queue, thanks.

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering