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

Commit f8d91e02 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Sasha Levin
Browse files

cifs: convert printk(LEVEL...) to pr_<level> 



[ Upstream commit 0b456f04bcdf5b1151136adaada158bfc26f1be7 ]

The useful macros embed message level in the name. Thus, it cleans up the code
a bit. In cases when it was plain printk() the conversion was done to info
level.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSteve French <steve.french@primarydata.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent c4785348

fs/cifs/cifs_debug.c

+2 −3
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ 
void

cifs_dump_mem(char *label, void *data, int length)

{

	printk(KERN_DEBUG "%s: dump of %d bytes of data at 0x%p\n",

		label, length, data);

	pr_debug("%s: dump of %d bytes of data at 0x%p\n", label, length, data);

	print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 4,

		       data, length, true);

}
@@ -51,7 +50,7 @@ void cifs_vfs_err(const char *fmt, ...) 
	vaf.fmt = fmt;

	vaf.va = &args;



	printk(KERN_ERR "CIFS VFS: %pV", &vaf);

	pr_err("CIFS VFS: %pV", &vaf);



	va_end(args);

}

fs/cifs/cifs_debug.h

+3 −4
Original line number Diff line number Diff line
@@ -53,13 +53,12 @@ __printf(1, 2) void cifs_vfs_err(const char *fmt, ...); 
do {									\

	if (type == FYI) {						\

		if (cifsFYI & CIFS_INFO) {				\

			printk(KERN_DEBUG "%s: " fmt,			\

			       __FILE__, ##__VA_ARGS__);		\

			pr_debug("%s: " fmt, __FILE__, ##__VA_ARGS__);	\

		}							\

	} else if (type == VFS) {					\

		cifs_vfs_err(fmt, ##__VA_ARGS__);			\

	} else if (type == NOISY && type != 0) {			\

		printk(KERN_DEBUG fmt, ##__VA_ARGS__);			\

		pr_debug(fmt, ##__VA_ARGS__);				\

	}								\

} while (0)
@@ -71,7 +70,7 @@ do { \ 
#define cifs_dbg(type, fmt, ...)					\

do {									\

	if (0)								\

		printk(KERN_DEBUG fmt, ##__VA_ARGS__);			\

		pr_debug(fmt, ##__VA_ARGS__);				\

} while (0)

#endif

fs/cifs/connect.c

+18 −33
Original line number Diff line number Diff line
@@ -1466,9 +1466,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
			vol->seal = 1;

			break;

		case Opt_noac:

			printk(KERN_WARNING "CIFS: Mount option noac not "

				"supported. Instead set "

				"/proc/fs/cifs/LookupCacheEnabled to 0\n");

			pr_warn("CIFS: Mount option noac not supported. Instead set /proc/fs/cifs/LookupCacheEnabled to 0\n");

			break;

		case Opt_fsc:

#ifndef CONFIG_CIFS_FSCACHE
@@ -1598,7 +1596,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 


			if (strnlen(string, CIFS_MAX_USERNAME_LEN) >

							CIFS_MAX_USERNAME_LEN) {

				printk(KERN_WARNING "CIFS: username too long\n");

				pr_warn("CIFS: username too long\n");

				goto cifs_parse_mount_err;

			}

			vol->username = kstrdup(string, GFP_KERNEL);
@@ -1662,8 +1660,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
			temp_len = strlen(value);

			vol->password = kzalloc(temp_len+1, GFP_KERNEL);

			if (vol->password == NULL) {

				printk(KERN_WARNING "CIFS: no memory "

						    "for password\n");

				pr_warn("CIFS: no memory for password\n");

				goto cifs_parse_mount_err;

			}
@@ -1687,8 +1684,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 


			if (!cifs_convert_address(dstaddr, string,

					strlen(string))) {

				printk(KERN_ERR "CIFS: bad ip= option (%s).\n",

					string);

				pr_err("CIFS: bad ip= option (%s).\n", string);

				goto cifs_parse_mount_err;

			}

			got_ip = true;
@@ -1700,15 +1696,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 


			if (strnlen(string, CIFS_MAX_DOMAINNAME_LEN)

					== CIFS_MAX_DOMAINNAME_LEN) {

				printk(KERN_WARNING "CIFS: domain name too"

						    " long\n");

				pr_warn("CIFS: domain name too long\n");

				goto cifs_parse_mount_err;

			}



			vol->domainname = kstrdup(string, GFP_KERNEL);

			if (!vol->domainname) {

				printk(KERN_WARNING "CIFS: no memory "

						    "for domainname\n");

				pr_warn("CIFS: no memory for domainname\n");

				goto cifs_parse_mount_err;

			}

			cifs_dbg(FYI, "Domain name set\n");
@@ -1721,8 +1715,8 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
			if (!cifs_convert_address(

					(struct sockaddr *)&vol->srcaddr,

					string, strlen(string))) {

				printk(KERN_WARNING "CIFS:  Could not parse"

						    " srcaddr: %s\n", string);

				pr_warn("CIFS: Could not parse srcaddr: %s\n",

					string);

				goto cifs_parse_mount_err;

			}

			break;
@@ -1732,8 +1726,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
				goto out_nomem;



			if (strnlen(string, 1024) >= 65) {

				printk(KERN_WARNING "CIFS: iocharset name "

						    "too long.\n");

				pr_warn("CIFS: iocharset name too long.\n");

				goto cifs_parse_mount_err;

			}
@@ -1741,8 +1734,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
				vol->iocharset = kstrdup(string,

							 GFP_KERNEL);

				if (!vol->iocharset) {

					printk(KERN_WARNING "CIFS: no memory"

							    "for charset\n");

					pr_warn("CIFS: no memory for charset\n");

					goto cifs_parse_mount_err;

				}

			}
@@ -1773,9 +1765,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
			 * set at top of the function

			 */

			if (i == RFC1001_NAME_LEN && string[i] != 0)

				printk(KERN_WARNING "CIFS: netbiosname"

				       " longer than 15 truncated.\n");



				pr_warn("CIFS: netbiosname longer than 15 truncated.\n");

			break;

		case Opt_servern:

			/* servernetbiosname specified override *SMBSERVER */
@@ -1801,8 +1791,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
			/* The string has 16th byte zero still from

			   set at top of the function  */

			if (i == RFC1001_NAME_LEN && string[i] != 0)

				printk(KERN_WARNING "CIFS: server net"

				       "biosname longer than 15 truncated.\n");

				pr_warn("CIFS: server netbiosname longer than 15 truncated.\n");

			break;

		case Opt_ver:

			string = match_strdup(args);
@@ -1814,8 +1803,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
				break;

			}

			/* For all other value, error */

			printk(KERN_WARNING "CIFS: Invalid version"

					    " specified\n");

			pr_warn("CIFS: Invalid version specified\n");

			goto cifs_parse_mount_err;

		case Opt_vers:

			string = match_strdup(args);
@@ -1856,7 +1844,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
	}



	if (!sloppy && invalid) {

		printk(KERN_ERR "CIFS: Unknown mount option \"%s\"\n", invalid);

		pr_err("CIFS: Unknown mount option \"%s\"\n", invalid);

		goto cifs_parse_mount_err;

	}
@@ -1882,8 +1870,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
		/* No ip= option specified? Try to get it from UNC */

		if (!cifs_convert_address(dstaddr, &vol->UNC[2],

						strlen(&vol->UNC[2]))) {

			printk(KERN_ERR "Unable to determine destination "

					"address.\n");

			pr_err("Unable to determine destination address.\n");

			goto cifs_parse_mount_err;

		}

	}
@@ -1894,20 +1881,18 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
	if (uid_specified)

		vol->override_uid = override_uid;

	else if (override_uid == 1)

		printk(KERN_NOTICE "CIFS: ignoring forceuid mount option "

				   "specified with no uid= option.\n");

		pr_notice("CIFS: ignoring forceuid mount option specified with no uid= option.\n");



	if (gid_specified)

		vol->override_gid = override_gid;

	else if (override_gid == 1)

		printk(KERN_NOTICE "CIFS: ignoring forcegid mount option "

				   "specified with no gid= option.\n");

		pr_notice("CIFS: ignoring forcegid mount option specified with no gid= option.\n");



	kfree(mountdata_copy);

	return 0;



out_nomem:

	printk(KERN_WARNING "Could not allocate temporary buffer\n");

	pr_warn("Could not allocate temporary buffer\n");

cifs_parse_mount_err:

	kfree(string);

	kfree(mountdata_copy);

fs/cifs/transport.c

+2 −2
Original line number Diff line number Diff line
@@ -99,9 +99,9 @@ DeleteMidQEntry(struct mid_q_entry *midEntry) 
	   something is wrong, unless it is quite a slow link or server */

	if ((now - midEntry->when_alloc) > HZ) {

		if ((cifsFYI & CIFS_TIMER) && (midEntry->command != command)) {

			printk(KERN_DEBUG " CIFS slow rsp: cmd %d mid %llu",

			pr_debug(" CIFS slow rsp: cmd %d mid %llu",

			       midEntry->command, midEntry->mid);

			printk(" A: 0x%lx S: 0x%lx R: 0x%lx\n",

			pr_info(" A: 0x%lx S: 0x%lx R: 0x%lx\n",

			       now - midEntry->when_alloc,

			       now - midEntry->when_sent,

			       now - midEntry->when_received);