diff options
author | Steve French <smfrench@gmail.com> | 2014-08-02 22:16:48 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2014-08-02 22:16:48 -0400 |
commit | 59b04c5df75bd715002bb535930ae1982a739269 (patch) | |
tree | 8ef4ccc086a0307cfe70fc193ba128482506ec98 | |
parent | 2075cf0b71bfffc4942e232f1487ac98bdfb7bf5 (diff) |
[CIFS] Fix incorrect hex vs. decimal in some debug print statements
Joe Perches and Hans Wennborg noticed that various places in the
kernel were printing decimal numbers with 0x prefix.
printk("0x%d") or equivalent
This fixes the instances of this in the cifs driver.
CC: Hans Wennborg <hans@hanshq.net>
CC: Joe Perches <joe@perches.com>
Signed-off-by: Steve French <smfrench@gmail.com>
-rw-r--r-- | fs/cifs/cifs_debug.c | 2 | ||||
-rw-r--r-- | fs/cifs/misc.c | 4 | ||||
-rw-r--r-- | fs/cifs/smb2misc.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c index f3ac4154cbb6..44ec72684df5 100644 --- a/fs/cifs/cifs_debug.c +++ b/fs/cifs/cifs_debug.c | |||
@@ -213,7 +213,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) | |||
213 | tcon->nativeFileSystem); | 213 | tcon->nativeFileSystem); |
214 | } | 214 | } |
215 | seq_printf(m, "DevInfo: 0x%x Attributes: 0x%x" | 215 | seq_printf(m, "DevInfo: 0x%x Attributes: 0x%x" |
216 | "\n\tPathComponentMax: %d Status: 0x%d", | 216 | "\n\tPathComponentMax: %d Status: %d", |
217 | le32_to_cpu(tcon->fsDevInfo.DeviceCharacteristics), | 217 | le32_to_cpu(tcon->fsDevInfo.DeviceCharacteristics), |
218 | le32_to_cpu(tcon->fsAttrInfo.Attributes), | 218 | le32_to_cpu(tcon->fsAttrInfo.Attributes), |
219 | le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength), | 219 | le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength), |
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index 64997a04ab59..e65e17b3d484 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c | |||
@@ -423,7 +423,7 @@ is_valid_oplock_break(char *buffer, struct TCP_Server_Info *srv) | |||
423 | return true; | 423 | return true; |
424 | } | 424 | } |
425 | if (pSMBr->hdr.Status.CifsError) { | 425 | if (pSMBr->hdr.Status.CifsError) { |
426 | cifs_dbg(FYI, "notify err 0x%d\n", | 426 | cifs_dbg(FYI, "notify err 0x%x\n", |
427 | pSMBr->hdr.Status.CifsError); | 427 | pSMBr->hdr.Status.CifsError); |
428 | return true; | 428 | return true; |
429 | } | 429 | } |
@@ -450,7 +450,7 @@ is_valid_oplock_break(char *buffer, struct TCP_Server_Info *srv) | |||
450 | if (pSMB->hdr.WordCount != 8) | 450 | if (pSMB->hdr.WordCount != 8) |
451 | return false; | 451 | return false; |
452 | 452 | ||
453 | cifs_dbg(FYI, "oplock type 0x%d level 0x%d\n", | 453 | cifs_dbg(FYI, "oplock type 0x%x level 0x%x\n", |
454 | pSMB->LockType, pSMB->OplockLevel); | 454 | pSMB->LockType, pSMB->OplockLevel); |
455 | if (!(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE)) | 455 | if (!(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE)) |
456 | return false; | 456 | return false; |
diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c index b8021fde987d..f2e6ac29a8d6 100644 --- a/fs/cifs/smb2misc.c +++ b/fs/cifs/smb2misc.c | |||
@@ -437,7 +437,7 @@ smb2_tcon_has_lease(struct cifs_tcon *tcon, struct smb2_lease_break *rsp, | |||
437 | continue; | 437 | continue; |
438 | 438 | ||
439 | cifs_dbg(FYI, "found in the open list\n"); | 439 | cifs_dbg(FYI, "found in the open list\n"); |
440 | cifs_dbg(FYI, "lease key match, lease break 0x%d\n", | 440 | cifs_dbg(FYI, "lease key match, lease break 0x%x\n", |
441 | le32_to_cpu(rsp->NewLeaseState)); | 441 | le32_to_cpu(rsp->NewLeaseState)); |
442 | 442 | ||
443 | server->ops->set_oplock_level(cinode, lease_state, 0, NULL); | 443 | server->ops->set_oplock_level(cinode, lease_state, 0, NULL); |
@@ -467,7 +467,7 @@ smb2_tcon_has_lease(struct cifs_tcon *tcon, struct smb2_lease_break *rsp, | |||
467 | } | 467 | } |
468 | 468 | ||
469 | cifs_dbg(FYI, "found in the pending open list\n"); | 469 | cifs_dbg(FYI, "found in the pending open list\n"); |
470 | cifs_dbg(FYI, "lease key match, lease break 0x%d\n", | 470 | cifs_dbg(FYI, "lease key match, lease break 0x%x\n", |
471 | le32_to_cpu(rsp->NewLeaseState)); | 471 | le32_to_cpu(rsp->NewLeaseState)); |
472 | 472 | ||
473 | open->oplock = lease_state; | 473 | open->oplock = lease_state; |
@@ -546,7 +546,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server) | |||
546 | return false; | 546 | return false; |
547 | } | 547 | } |
548 | 548 | ||
549 | cifs_dbg(FYI, "oplock level 0x%d\n", rsp->OplockLevel); | 549 | cifs_dbg(FYI, "oplock level 0x%x\n", rsp->OplockLevel); |
550 | 550 | ||
551 | /* look up tcon based on tid & uid */ | 551 | /* look up tcon based on tid & uid */ |
552 | spin_lock(&cifs_tcp_ses_lock); | 552 | spin_lock(&cifs_tcp_ses_lock); |