Commit a6b84957 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs update from Steve French:
 "Mostly cifs cleanup but also a few cifs fixes"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: remove unneeded condition check
  Set UID in sess_auth_rawntlmssp_authenticate too
  cifs: convert printk(LEVEL...) to pr_<level>
  cifs: convert to print_hex_dump() instead of custom implementation
  cifs: call strtobool instead of custom implementation
  Update MAINTAINERS entry
  Update modinfo cifs version for cifs.ko
  decode_negTokenInit had wrong calling sequence
  Add missing defines for ACL query support
  Add support for original fallocate
parents 1715ac63 15d98706

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -2528,8 +2528,7 @@ M: Steve French <sfrench@samba.org> 
L:	linux-cifs@vger.kernel.org

L:	samba-technical@lists.samba.org (moderated for non-subscribers)

W:	http://linux-cifs.samba.org/

Q:	http://patchwork.ozlabs.org/project/linux-cifs-client/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git

T:	git git://git.samba.org/sfrench/cifs-2.6.git

S:	Supported

F:	Documentation/filesystems/cifs/

F:	fs/cifs/

fs/cifs/cifs_debug.c

+33 −44
Original line number Diff line number Diff line
@@ -34,27 +34,9 @@ 
void

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

{

	int i, j;

	int *intptr = data;

	char *charptr = data;

	char buf[10], line[80];



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

		label, length, data);

	for (i = 0; i < length; i += 16) {

		line[0] = 0;

		for (j = 0; (j < 4) && (i + j * 4 < length); j++) {

			sprintf(buf, " %08x", intptr[i / 4 + j]);

			strcat(line, buf);

		}

		buf[0] = ' ';

		buf[2] = 0;

		for (j = 0; (j < 16) && (i + j < length); j++) {

			buf[1] = isprint(charptr[i + j]) ? charptr[i + j] : '.';

			strcat(line, buf);

		}

		printk(KERN_DEBUG "%s\n", line);

	}

	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);

}



#ifdef CONFIG_CIFS_DEBUG
@@ -68,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);

}
@@ -274,6 +256,7 @@ static ssize_t cifs_stats_proc_write(struct file *file, 
		const char __user *buffer, size_t count, loff_t *ppos)

{

	char c;

	bool bv;

	int rc;

	struct list_head *tmp1, *tmp2, *tmp3;

	struct TCP_Server_Info *server;
@@ -284,7 +267,7 @@ static ssize_t cifs_stats_proc_write(struct file *file, 
	if (rc)

		return rc;



	if (c == '1' || c == 'y' || c == 'Y' || c == '0') {

	if (strtobool(&c, &bv) == 0) {

#ifdef CONFIG_CIFS_STATS2

		atomic_set(&totBufAllocCount, 0);

		atomic_set(&totSmBufAllocCount, 0);
@@ -451,15 +434,14 @@ static ssize_t cifsFYI_proc_write(struct file *file, const char __user *buffer, 
		size_t count, loff_t *ppos)

{

	char c;

	bool bv;

	int rc;



	rc = get_user(c, buffer);

	if (rc)

		return rc;

	if (c == '0' || c == 'n' || c == 'N')

		cifsFYI = 0;

	else if (c == '1' || c == 'y' || c == 'Y')

		cifsFYI = 1;

	if (strtobool(&c, &bv) == 0)

		cifsFYI = bv;

	else if ((c > '1') && (c <= '9'))

		cifsFYI = (int) (c - '0'); /* see cifs_debug.h for meanings */
@@ -490,15 +472,18 @@ static ssize_t cifs_linux_ext_proc_write(struct file *file, 
		const char __user *buffer, size_t count, loff_t *ppos)

{

	char c;

	bool bv;

	int rc;



	rc = get_user(c, buffer);

	if (rc)

		return rc;

	if (c == '0' || c == 'n' || c == 'N')

		linuxExtEnabled = 0;

	else if (c == '1' || c == 'y' || c == 'Y')

		linuxExtEnabled = 1;



	rc = strtobool(&c, &bv);

	if (rc)

		return rc;



	linuxExtEnabled = bv;



	return count;

}
@@ -527,15 +512,18 @@ static ssize_t cifs_lookup_cache_proc_write(struct file *file, 
		const char __user *buffer, size_t count, loff_t *ppos)

{

	char c;

	bool bv;

	int rc;



	rc = get_user(c, buffer);

	if (rc)

		return rc;

	if (c == '0' || c == 'n' || c == 'N')

		lookupCacheEnabled = 0;

	else if (c == '1' || c == 'y' || c == 'Y')

		lookupCacheEnabled = 1;



	rc = strtobool(&c, &bv);

	if (rc)

		return rc;



	lookupCacheEnabled = bv;



	return count;

}
@@ -564,15 +552,18 @@ static ssize_t traceSMB_proc_write(struct file *file, const char __user *buffer, 
		size_t count, loff_t *ppos)

{

	char c;

	bool bv;

	int rc;



	rc = get_user(c, buffer);

	if (rc)

		return rc;

	if (c == '0' || c == 'n' || c == 'N')

		traceSMB = 0;

	else if (c == '1' || c == 'y' || c == 'Y')

		traceSMB = 1;



	rc = strtobool(&c, &bv);

	if (rc)

		return rc;



	traceSMB = bv;



	return count;

}
@@ -630,6 +621,7 @@ static ssize_t cifs_security_flags_proc_write(struct file *file, 
	unsigned int flags;

	char flags_string[12];

	char c;

	bool bv;



	if ((count < 1) || (count > 11))

		return -EINVAL;
@@ -642,11 +634,8 @@ static ssize_t cifs_security_flags_proc_write(struct file *file, 
	if (count < 3) {

		/* single char or single char followed by null */

		c = flags_string[0];

		if (c == '0' || c == 'n' || c == 'N') {

			global_secflags = CIFSSEC_DEF; /* default */

			return count;

		} else if (c == '1' || c == 'y' || c == 'Y') {

			global_secflags = CIFSSEC_MAX;

		if (strtobool(&c, &bv) == 0) {

			global_secflags = bv ? CIFSSEC_MAX : CIFSSEC_DEF;

			return count;

		} else if (!isdigit(c)) {

			cifs_dbg(VFS, "Invalid SecurityFlags: %s\n",

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/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -136,5 +136,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); 
extern const struct export_operations cifs_export_ops;

#endif /* CONFIG_CIFS_NFSD_EXPORT */



#define CIFS_VERSION   "2.05"

#define CIFS_VERSION   "2.06"

#endif				/* _CIFSFS_H */

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);