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

Commit ac3aa2f8 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: remove extraneous newlines from cERROR and cFYI calls 



Those macros add a newline on their own, so there's not any need to
embed one in the message itself.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 00401ff7

fs/cifs/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static uint16_t cifs_super_get_key(const void *cookie_netfs_data, void *buffer, 


	sharename = extract_sharename(tcon->treeName);

	if (IS_ERR(sharename)) {

		cFYI(1, "%s: couldn't extract sharename\n", __func__);

		cFYI(1, "%s: couldn't extract sharename", __func__);

		sharename = NULL;

		return 0;

	}

fs/cifs/cifsacl.c

+3 −3
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ init_cifs_idmap(void) 
	struct key *keyring;

	int ret;



	cFYI(1, "Registering the %s key type\n", cifs_idmap_key_type.name);

	cFYI(1, "Registering the %s key type", cifs_idmap_key_type.name);



	/* create an override credential set with a special thread keyring in

	 * which requests are cached
@@ -572,7 +572,7 @@ init_cifs_idmap(void) 
	sidgidtree = RB_ROOT;

	register_shrinker(&cifs_shrinker);



	cFYI(1, "cifs idmap keyring: %d\n", key_serial(keyring));

	cFYI(1, "cifs idmap keyring: %d", key_serial(keyring));

	return 0;



failed_put_key:
@@ -589,7 +589,7 @@ exit_cifs_idmap(void) 
	unregister_key_type(&cifs_idmap_key_type);

	put_cred(root_cred);

	unregister_shrinker(&cifs_shrinker);

	cFYI(1, "Unregistered %s key type\n", cifs_idmap_key_type.name);

	cFYI(1, "Unregistered %s key type", cifs_idmap_key_type.name);

}



void

fs/cifs/cifsencrypt.c

+24 −24
Original line number Diff line number Diff line
@@ -47,20 +47,20 @@ static int cifs_calc_signature(const struct kvec *iov, int n_vec, 
		return -EINVAL;



	if (!server->secmech.sdescmd5) {

		cERROR(1, "%s: Can't generate signature\n", __func__);

		cERROR(1, "%s: Can't generate signature", __func__);

		return -1;

	}



	rc = crypto_shash_init(&server->secmech.sdescmd5->shash);

	if (rc) {

		cERROR(1, "%s: Could not init md5\n", __func__);

		cERROR(1, "%s: Could not init md5", __func__);

		return rc;

	}



	rc = crypto_shash_update(&server->secmech.sdescmd5->shash,

		server->session_key.response, server->session_key.len);

	if (rc) {

		cERROR(1, "%s: Could not update with response\n", __func__);

		cERROR(1, "%s: Could not update with response", __func__);

		return rc;

	}
@@ -85,7 +85,7 @@ static int cifs_calc_signature(const struct kvec *iov, int n_vec, 
				iov[i].iov_base, iov[i].iov_len);

		}

		if (rc) {

			cERROR(1, "%s: Could not update with payload\n",

			cERROR(1, "%s: Could not update with payload",

							__func__);

			return rc;

		}
@@ -93,7 +93,7 @@ static int cifs_calc_signature(const struct kvec *iov, int n_vec, 


	rc = crypto_shash_final(&server->secmech.sdescmd5->shash, signature);

	if (rc)

		cERROR(1, "%s: Could not generate md5 hash\n", __func__);

		cERROR(1, "%s: Could not generate md5 hash", __func__);



	return rc;

}
@@ -399,7 +399,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, 
	wchar_t *server;



	if (!ses->server->secmech.sdeschmacmd5) {

		cERROR(1, "calc_ntlmv2_hash: can't generate ntlmv2 hash\n");

		cERROR(1, "calc_ntlmv2_hash: can't generate ntlmv2 hash");

		return -1;

	}
@@ -415,7 +415,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, 


	rc = crypto_shash_init(&ses->server->secmech.sdeschmacmd5->shash);

	if (rc) {

		cERROR(1, "calc_ntlmv2_hash: could not init hmacmd5\n");

		cERROR(1, "calc_ntlmv2_hash: could not init hmacmd5");

		return rc;

	}
@@ -423,7 +423,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, 
	len = ses->user_name ? strlen(ses->user_name) : 0;

	user = kmalloc(2 + (len * 2), GFP_KERNEL);

	if (user == NULL) {

		cERROR(1, "calc_ntlmv2_hash: user mem alloc failure\n");

		cERROR(1, "calc_ntlmv2_hash: user mem alloc failure");

		rc = -ENOMEM;

		return rc;

	}
@@ -439,7 +439,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, 
				(char *)user, 2 * len);

	kfree(user);

	if (rc) {

		cERROR(1, "%s: Could not update with user\n", __func__);

		cERROR(1, "%s: Could not update with user", __func__);

		return rc;

	}
@@ -460,7 +460,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, 
					(char *)domain, 2 * len);

		kfree(domain);

		if (rc) {

			cERROR(1, "%s: Could not update with domain\n",

			cERROR(1, "%s: Could not update with domain",

								__func__);

			return rc;

		}
@@ -480,7 +480,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, 
					(char *)server, 2 * len);

		kfree(server);

		if (rc) {

			cERROR(1, "%s: Could not update with server\n",

			cERROR(1, "%s: Could not update with server",

								__func__);

			return rc;

		}
@@ -489,7 +489,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, 
	rc = crypto_shash_final(&ses->server->secmech.sdeschmacmd5->shash,

					ntlmv2_hash);

	if (rc)

		cERROR(1, "%s: Could not generate md5 hash\n", __func__);

		cERROR(1, "%s: Could not generate md5 hash", __func__);



	return rc;

}
@@ -501,7 +501,7 @@ CalcNTLMv2_response(const struct cifs_ses *ses, char *ntlmv2_hash) 
	unsigned int offset = CIFS_SESS_KEY_SIZE + 8;



	if (!ses->server->secmech.sdeschmacmd5) {

		cERROR(1, "calc_ntlmv2_hash: can't generate ntlmv2 hash\n");

		cERROR(1, "calc_ntlmv2_hash: can't generate ntlmv2 hash");

		return -1;

	}
@@ -527,14 +527,14 @@ CalcNTLMv2_response(const struct cifs_ses *ses, char *ntlmv2_hash) 
	rc = crypto_shash_update(&ses->server->secmech.sdeschmacmd5->shash,

		ses->auth_key.response + offset, ses->auth_key.len - offset);

	if (rc) {

		cERROR(1, "%s: Could not update with response\n", __func__);

		cERROR(1, "%s: Could not update with response", __func__);

		return rc;

	}



	rc = crypto_shash_final(&ses->server->secmech.sdeschmacmd5->shash,

		ses->auth_key.response + CIFS_SESS_KEY_SIZE);

	if (rc)

		cERROR(1, "%s: Could not generate md5 hash\n", __func__);

		cERROR(1, "%s: Could not generate md5 hash", __func__);



	return rc;

}
@@ -613,7 +613,7 @@ setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp) 


	rc = crypto_shash_init(&ses->server->secmech.sdeschmacmd5->shash);

	if (rc) {

		cERROR(1, "%s: Could not init hmacmd5\n", __func__);

		cERROR(1, "%s: Could not init hmacmd5", __func__);

		goto setup_ntlmv2_rsp_ret;

	}
@@ -621,14 +621,14 @@ setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp) 
		ses->auth_key.response + CIFS_SESS_KEY_SIZE,

		CIFS_HMAC_MD5_HASH_SIZE);

	if (rc) {

		cERROR(1, "%s: Could not update with response\n", __func__);

		cERROR(1, "%s: Could not update with response", __func__);

		goto setup_ntlmv2_rsp_ret;

	}



	rc = crypto_shash_final(&ses->server->secmech.sdeschmacmd5->shash,

		ses->auth_key.response);

	if (rc)

		cERROR(1, "%s: Could not generate md5 hash\n", __func__);

		cERROR(1, "%s: Could not generate md5 hash", __func__);



setup_ntlmv2_rsp_ret:

	kfree(tiblob);
@@ -650,7 +650,7 @@ calc_seckey(struct cifs_ses *ses) 
	tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);

	if (IS_ERR(tfm_arc4)) {

		rc = PTR_ERR(tfm_arc4);

		cERROR(1, "could not allocate crypto API arc4\n");

		cERROR(1, "could not allocate crypto API arc4");

		return rc;

	}
@@ -668,7 +668,7 @@ calc_seckey(struct cifs_ses *ses) 


	rc = crypto_blkcipher_encrypt(&desc, &sgout, &sgin, CIFS_CPHTXT_SIZE);

	if (rc) {

		cERROR(1, "could not encrypt session key rc: %d\n", rc);

		cERROR(1, "could not encrypt session key rc: %d", rc);

		crypto_free_blkcipher(tfm_arc4);

		return rc;

	}
@@ -705,13 +705,13 @@ cifs_crypto_shash_allocate(struct TCP_Server_Info *server) 


	server->secmech.hmacmd5 = crypto_alloc_shash("hmac(md5)", 0, 0);

	if (IS_ERR(server->secmech.hmacmd5)) {

		cERROR(1, "could not allocate crypto hmacmd5\n");

		cERROR(1, "could not allocate crypto hmacmd5");

		return PTR_ERR(server->secmech.hmacmd5);

	}



	server->secmech.md5 = crypto_alloc_shash("md5", 0, 0);

	if (IS_ERR(server->secmech.md5)) {

		cERROR(1, "could not allocate crypto md5\n");

		cERROR(1, "could not allocate crypto md5");

		rc = PTR_ERR(server->secmech.md5);

		goto crypto_allocate_md5_fail;

	}
@@ -720,7 +720,7 @@ cifs_crypto_shash_allocate(struct TCP_Server_Info *server) 
			crypto_shash_descsize(server->secmech.hmacmd5);

	server->secmech.sdeschmacmd5 = kmalloc(size, GFP_KERNEL);

	if (!server->secmech.sdeschmacmd5) {

		cERROR(1, "cifs_crypto_shash_allocate: can't alloc hmacmd5\n");

		cERROR(1, "cifs_crypto_shash_allocate: can't alloc hmacmd5");

		rc = -ENOMEM;

		goto crypto_allocate_hmacmd5_sdesc_fail;

	}
@@ -732,7 +732,7 @@ cifs_crypto_shash_allocate(struct TCP_Server_Info *server) 
			crypto_shash_descsize(server->secmech.md5);

	server->secmech.sdescmd5 = kmalloc(size, GFP_KERNEL);

	if (!server->secmech.sdescmd5) {

		cERROR(1, "cifs_crypto_shash_allocate: can't alloc md5\n");

		cERROR(1, "cifs_crypto_shash_allocate: can't alloc md5");

		rc = -ENOMEM;

		goto crypto_allocate_md5_sdesc_fail;

	}

fs/cifs/cifssmb.c

+5 −5
Original line number Diff line number Diff line
@@ -4137,7 +4137,7 @@ UnixQFileInfoRetry: 
		rc = validate_t2((struct smb_t2_rsp *)pSMBr);



		if (rc || get_bcc(&pSMBr->hdr) < sizeof(FILE_UNIX_BASIC_INFO)) {

			cERROR(1, "Malformed FILE_UNIX_BASIC_INFO response.\n"

			cERROR(1, "Malformed FILE_UNIX_BASIC_INFO response. "

				   "Unix Extensions can be disabled on mount "

				   "by specifying the nosfu mount option.");

			rc = -EIO;	/* bad smb */
@@ -4223,7 +4223,7 @@ UnixQPathInfoRetry: 
		rc = validate_t2((struct smb_t2_rsp *)pSMBr);



		if (rc || get_bcc(&pSMBr->hdr) < sizeof(FILE_UNIX_BASIC_INFO)) {

			cERROR(1, "Malformed FILE_UNIX_BASIC_INFO response.\n"

			cERROR(1, "Malformed FILE_UNIX_BASIC_INFO response. "

				   "Unix Extensions can be disabled on mount "

				   "by specifying the nosfu mount option.");

			rc = -EIO;	/* bad smb */
@@ -4675,7 +4675,7 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, 


	if (*num_of_nodes < 1) {

		cERROR(1, "num_referrals: must be at least > 0,"

			"but we get num_referrals = %d\n", *num_of_nodes);

			"but we get num_referrals = %d", *num_of_nodes);

		rc = -EINVAL;

		goto parse_DFS_referrals_exit;

	}
@@ -4692,14 +4692,14 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, 
	data_end = (char *)(&(pSMBr->PathConsumed)) +

				le16_to_cpu(pSMBr->t2.DataCount);



	cFYI(1, "num_referrals: %d dfs flags: 0x%x ...\n",

	cFYI(1, "num_referrals: %d dfs flags: 0x%x ...",

			*num_of_nodes,

			le32_to_cpu(pSMBr->DFSFlags));



	*target_nodes = kzalloc(sizeof(struct dfs_info3_param) *

			*num_of_nodes, GFP_KERNEL);

	if (*target_nodes == NULL) {

		cERROR(1, "Failed to allocate buffer for target_nodes\n");

		cERROR(1, "Failed to allocate buffer for target_nodes");

		rc = -ENOMEM;

		goto parse_DFS_referrals_exit;

	}

fs/cifs/connect.c

+7 −7
Original line number Diff line number Diff line
@@ -2412,7 +2412,7 @@ cifs_put_smb_ses(struct cifs_ses *ses) 
	int xid;

	struct TCP_Server_Info *server = ses->server;



	cFYI(1, "%s: ses_count=%d\n", __func__, ses->ses_count);

	cFYI(1, "%s: ses_count=%d", __func__, ses->ses_count);

	spin_lock(&cifs_tcp_ses_lock);

	if (--ses->ses_count > 0) {

		spin_unlock(&cifs_tcp_ses_lock);
@@ -2700,7 +2700,7 @@ cifs_put_tcon(struct cifs_tcon *tcon) 
	int xid;

	struct cifs_ses *ses = tcon->ses;



	cFYI(1, "%s: tc_count=%d\n", __func__, tcon->tc_count);

	cFYI(1, "%s: tc_count=%d", __func__, tcon->tc_count);

	spin_lock(&cifs_tcp_ses_lock);

	if (--tcon->tc_count > 0) {

		spin_unlock(&cifs_tcp_ses_lock);
@@ -3009,11 +3009,11 @@ bind_socket(struct TCP_Server_Info *server) 
			saddr6 = (struct sockaddr_in6 *)&server->srcaddr;

			if (saddr6->sin6_family == AF_INET6)

				cERROR(1, "cifs: "

				       "Failed to bind to: %pI6c, error: %d\n",

				       "Failed to bind to: %pI6c, error: %d",

				       &saddr6->sin6_addr, rc);

			else

				cERROR(1, "cifs: "

				       "Failed to bind to: %pI4, error: %d\n",

				       "Failed to bind to: %pI4, error: %d",

				       &saddr4->sin_addr.s_addr, rc);

		}

	}
@@ -3305,8 +3305,8 @@ void reset_cifs_unix_caps(int xid, struct cifs_tcon *tcon, 
			} else

				cERROR(1, "Negotiating Unix capabilities "

					   "with the server failed. Consider "

					   "mounting with the Unix Extensions\n"

					   "disabled, if problems are found, "

					   "mounting with the Unix Extensions "

					   "disabled if problems are found "

					   "by specifying the nounix mount "

					   "option.");