Commit bde1694a authored by Namjae Jeon's avatar Namjae Jeon
Browse files

ksmbd: remove ksmbd_err/info 



Use the pr_fmt built into pr_*. and use pr_err/info after removing
wrapper ksmbd_err/info.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 3fbe43c9

fs/cifsd/auth.c

+8 −10
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ int ksmbd_auth_ntlm(struct ksmbd_session *sess, char *pw_buf) 
	memcpy(p21, user_passkey(sess->user), CIFS_NTHASH_SIZE);

	rc = ksmbd_enc_p24(p21, sess->ntlmssp.cryptkey, key);

	if (rc) {

		ksmbd_err("password processing failed\n");

		pr_err("password processing failed\n");

		return rc;

	}
@@ -461,7 +461,7 @@ static int __ksmbd_auth_ntlmv2(struct ksmbd_session *sess, char *client_nonce, 
				       client_nonce,

				       (char *)sess->ntlmssp.cryptkey, 8);

	if (rc) {

		ksmbd_err("password processing failed\n");

		pr_err("password processing failed\n");

		goto out;

	}
@@ -469,7 +469,7 @@ static int __ksmbd_auth_ntlmv2(struct ksmbd_session *sess, char *client_nonce, 
	memcpy(p21, user_passkey(sess->user), CIFS_NTHASH_SIZE);

	rc = ksmbd_enc_p24(p21, sess_key, key);

	if (rc) {

		ksmbd_err("password processing failed\n");

		pr_err("password processing failed\n");

		goto out;

	}
@@ -1269,7 +1269,7 @@ int ksmbd_crypt_message(struct ksmbd_conn *conn, struct kvec *iov, 
				      enc,

				      key);

	if (rc) {

		ksmbd_err("Could not get %scryption key\n", enc ? "en" : "de");

		pr_err("Could not get %scryption key\n", enc ? "en" : "de");

		return rc;

	}
@@ -1279,7 +1279,7 @@ int ksmbd_crypt_message(struct ksmbd_conn *conn, struct kvec *iov, 
	else

		ctx = ksmbd_crypto_ctx_find_ccm();

	if (!ctx) {

		ksmbd_err("crypto alloc failed\n");

		pr_err("crypto alloc failed\n");

		return -ENOMEM;

	}
@@ -1295,19 +1295,18 @@ int ksmbd_crypt_message(struct ksmbd_conn *conn, struct kvec *iov, 
	else

		rc = crypto_aead_setkey(tfm, key, SMB3_GCM128_CRYPTKEY_SIZE);

	if (rc) {

		ksmbd_err("Failed to set aead key %d\n", rc);

		pr_err("Failed to set aead key %d\n", rc);

		goto free_ctx;

	}



	rc = crypto_aead_setauthsize(tfm, SMB2_SIGNATURE_SIZE);

	if (rc) {

		ksmbd_err("Failed to set authsize %d\n", rc);

		pr_err("Failed to set authsize %d\n", rc);

		goto free_ctx;

	}



	req = aead_request_alloc(tfm, GFP_KERNEL);

	if (!req) {

		ksmbd_err("Failed to alloc aead request\n");

		rc = -ENOMEM;

		goto free_ctx;

	}
@@ -1319,7 +1318,7 @@ int ksmbd_crypt_message(struct ksmbd_conn *conn, struct kvec *iov, 


	sg = ksmbd_init_sg(iov, nvec, sign);

	if (!sg) {

		ksmbd_err("Failed to init sg\n");

		pr_err("Failed to init sg\n");

		rc = -ENOMEM;

		goto free_req;

	}
@@ -1327,7 +1326,6 @@ int ksmbd_crypt_message(struct ksmbd_conn *conn, struct kvec *iov, 
	iv_len = crypto_aead_ivsize(tfm);

	iv = kzalloc(iv_len, GFP_KERNEL);

	if (!iv) {

		ksmbd_err("Failed to alloc IV\n");

		rc = -ENOMEM;

		goto free_sg;

	}

fs/cifsd/connection.c

+7 −8
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ int ksmbd_conn_write(struct ksmbd_work *work) 


	ksmbd_conn_try_dequeue_request(work);

	if (!rsp_hdr) {

		ksmbd_err("NULL response header\n");

		pr_err("NULL response header\n");

		return -EINVAL;

	}
@@ -192,7 +192,7 @@ int ksmbd_conn_write(struct ksmbd_work *work) 
	ksmbd_conn_unlock(conn);



	if (sent < 0) {

		ksmbd_err("Failed to send message: %d\n", sent);

		pr_err("Failed to send message: %d\n", sent);

		return sent;

	}
@@ -315,24 +315,23 @@ int ksmbd_conn_handler_loop(void *p) 
		 */

		size = t->ops->read(t, conn->request_buf + 4, pdu_size);

		if (size < 0) {

			ksmbd_err("sock_read failed: %d\n", size);

			pr_err("sock_read failed: %d\n", size);

			break;

		}



		if (size != pdu_size) {

			ksmbd_err("PDU error. Read: %d, Expected: %d\n",

				  size,

				  pdu_size);

			pr_err("PDU error. Read: %d, Expected: %d\n",

			       size, pdu_size);

			continue;

		}



		if (!default_conn_ops.process_fn) {

			ksmbd_err("No connection request callback\n");

			pr_err("No connection request callback\n");

			break;

		}



		if (default_conn_ops.process_fn(conn)) {

			ksmbd_err("Cannot handle request\n");

			pr_err("Cannot handle request\n");

			break;

		}

	}

fs/cifsd/crypto_ctx.c

+2 −2
Original line number Diff line number Diff line
@@ -48,12 +48,12 @@ static struct crypto_aead *alloc_aead(int id) 
		tfm = crypto_alloc_aead("ccm(aes)", 0, 0);

		break;

	default:

		ksmbd_err("Does not support encrypt ahead(id : %d)\n", id);

		pr_err("Does not support encrypt ahead(id : %d)\n", id);

		return NULL;

	}



	if (IS_ERR(tfm)) {

		ksmbd_err("Failed to alloc encrypt aead : %ld\n", PTR_ERR(tfm));

		pr_err("Failed to alloc encrypt aead : %ld\n", PTR_ERR(tfm));

		return NULL;

	}

fs/cifsd/glob.h

+7 −17
Original line number Diff line number Diff line
@@ -31,32 +31,22 @@ extern int ksmbd_debug_types; 
				KSMBD_DEBUG_IPC | KSMBD_DEBUG_CONN |	\

				KSMBD_DEBUG_RDMA)



#ifndef ksmbd_pr_fmt

#ifdef pr_fmt

#undef pr_fmt

#endif



#ifdef SUBMOD_NAME

#define ksmbd_pr_fmt(fmt)	"ksmbd: " SUBMOD_NAME ": " fmt

#define pr_fmt(fmt)	"ksmbd: " SUBMOD_NAME ": " fmt

#else

#define ksmbd_pr_fmt(fmt)	"ksmbd: " fmt

#endif

#define pr_fmt(fmt)	"ksmbd: " fmt

#endif



#define ksmbd_debug(type, fmt, ...)				\

	do {							\

		if (ksmbd_debug_types & KSMBD_DEBUG_##type)	\

			pr_info(ksmbd_pr_fmt("%s:%d: " fmt),	\

				__func__,			\

				__LINE__,			\

				##__VA_ARGS__);			\

			pr_info(fmt, ##__VA_ARGS__);		\

	} while (0)



#define ksmbd_info(fmt, ...)					\

			pr_info(ksmbd_pr_fmt(fmt), ##__VA_ARGS__)



#define ksmbd_err(fmt, ...)					\

			pr_err(ksmbd_pr_fmt("%s:%d: " fmt),	\

				__func__,			\

				__LINE__,			\

				##__VA_ARGS__)



#define UNICODE_LEN(x)		((x) * 2)



#endif /* __KSMBD_GLOB_H */

fs/cifsd/mgmt/user_session.c

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int __rpc_method(char *rpc_name) 
	if (!strcmp(rpc_name, "\\lsarpc") || !strcmp(rpc_name, "lsarpc"))

		return KSMBD_RPC_LSARPC_METHOD_INVOKE;



	ksmbd_err("Unsupported RPC: %s\n", rpc_name);

	pr_err("Unsupported RPC: %s\n", rpc_name);

	return 0;

}
@@ -232,7 +232,7 @@ int get_session(struct ksmbd_session *sess) 
void put_session(struct ksmbd_session *sess)

{

	if (atomic_dec_and_test(&sess->refcnt))

		ksmbd_err("get/%s seems to be mismatched.", __func__);

		pr_err("get/%s seems to be mismatched.", __func__);

}



struct ksmbd_session *ksmbd_session_lookup_slowpath(unsigned long long id)