Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59b04c5d authored by Steve French's avatar Steve French
Browse files

[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: default avatarSteve French <smfrench@gmail.com>
parent 2075cf0b

fs/cifs/cifs_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
						   tcon->nativeFileSystem);

				}

				seq_printf(m, "DevInfo: 0x%x Attributes: 0x%x"

					"\n\tPathComponentMax: %d Status: 0x%d",

					"\n\tPathComponentMax: %d Status: %d",

					le32_to_cpu(tcon->fsDevInfo.DeviceCharacteristics),

					le32_to_cpu(tcon->fsAttrInfo.Attributes),

					le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength),

fs/cifs/misc.c

+2 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ is_valid_oplock_break(char *buffer, struct TCP_Server_Info *srv) 
			return true;

		}

		if (pSMBr->hdr.Status.CifsError) {

			cifs_dbg(FYI, "notify err 0x%d\n",

			cifs_dbg(FYI, "notify err 0x%x\n",

				 pSMBr->hdr.Status.CifsError);

			return true;

		}
@@ -450,7 +450,7 @@ is_valid_oplock_break(char *buffer, struct TCP_Server_Info *srv) 
	if (pSMB->hdr.WordCount != 8)

		return false;



	cifs_dbg(FYI, "oplock type 0x%d level 0x%d\n",

	cifs_dbg(FYI, "oplock type 0x%x level 0x%x\n",

		 pSMB->LockType, pSMB->OplockLevel);

	if (!(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE))

		return false;

fs/cifs/smb2misc.c

+3 −3
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ smb2_tcon_has_lease(struct cifs_tcon *tcon, struct smb2_lease_break *rsp, 
			continue;



		cifs_dbg(FYI, "found in the open list\n");

		cifs_dbg(FYI, "lease key match, lease break 0x%d\n",

		cifs_dbg(FYI, "lease key match, lease break 0x%x\n",

			 le32_to_cpu(rsp->NewLeaseState));



		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, 
		}



		cifs_dbg(FYI, "found in the pending open list\n");

		cifs_dbg(FYI, "lease key match, lease break 0x%d\n",

		cifs_dbg(FYI, "lease key match, lease break 0x%x\n",

			 le32_to_cpu(rsp->NewLeaseState));



		open->oplock = lease_state;
@@ -546,7 +546,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server) 
			return false;

	}



	cifs_dbg(FYI, "oplock level 0x%d\n", rsp->OplockLevel);

	cifs_dbg(FYI, "oplock level 0x%x\n", rsp->OplockLevel);



	/* look up tcon based on tid & uid */

	spin_lock(&cifs_tcp_ses_lock);