Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (4b1fefac) · Commits · 戴 / test

fs/cifs/asn1.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -400,7 +400,7 @@ asn1_oid_decode(struct asn1_ctx *ctx,
	size = eoc - ctx->pointer + 1;		size = eoc - ctx->pointer + 1;

	/* first subid actually encodes first two subids */		/* first subid actually encodes first two subids */
	if (size < 2 \|\| size > ULONG_MAX/sizeof(unsigned long))		if (size < 2 \|\| size > UINT_MAX/sizeof(unsigned long))
	return 0;		return 0;

	oid = kmalloc(size sizeof(unsigned long), GFP_ATOMIC);		oid = kmalloc(size sizeof(unsigned long), GFP_ATOMIC);
	@@ -494,7 +494,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,
	/* remember to free obj->oid */		/* remember to free obj->oid */
	rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag);		rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag);
	if (rc) {		if (rc) {
	if ((tag == ASN1_OJI) && (cls == ASN1_PRI)) {		if ((tag == ASN1_OJI) && (con == ASN1_PRI)) {
	rc = asn1_oid_decode(&ctx, end, &oid, &oidlen);		rc = asn1_oid_decode(&ctx, end, &oid, &oidlen);
	if (rc) {		if (rc) {
	rc = compare_oid(oid, oidlen,		rc = compare_oid(oid, oidlen,

fs/cifs/cifs_debug.c

+248 −397

Original line number	Original line	Diff line number	Diff line
	@@ -107,9 +107,7 @@ void cifs_dump_mids(struct TCP_Server_Info *server)
	#endif /* CONFIG_CIFS_DEBUG2 */		#endif /* CONFIG_CIFS_DEBUG2 */

	#ifdef CONFIG_PROC_FS		#ifdef CONFIG_PROC_FS
	static int		static int cifs_debug_data_proc_show(struct seq_file m, void v)
	cifs_debug_data_read(char buf, char *beginBuffer, off_t offset,
	int count, int eof, void data)
	{		{
	struct list_head *tmp;		struct list_head *tmp;
	struct list_head *tmp1;		struct list_head *tmp1;
	@@ -117,23 +115,13 @@ cifs_debug_data_read(char buf, char *beginBuffer, off_t offset,
	struct cifsSesInfo *ses;		struct cifsSesInfo *ses;
	struct cifsTconInfo *tcon;		struct cifsTconInfo *tcon;
	int i;		int i;
	int length = 0;
	char *original_buf = buf;

	*beginBuffer = buf + offset;		seq_puts(m,

	length =
	sprintf(buf,
	"Display Internal CIFS Data Structures for Debugging\n"		"Display Internal CIFS Data Structures for Debugging\n"
	"---------------------------------------------------\n");		"---------------------------------------------------\n");
	buf += length;		seq_printf(m, "CIFS Version %s\n", CIFS_VERSION);
	length = sprintf(buf, "CIFS Version %s\n", CIFS_VERSION);		seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);
	buf += length;		seq_printf(m, "Servers:");
	length = sprintf(buf,
	"Active VFS Requests: %d\n", GlobalTotalActiveXid);
	buf += length;
	length = sprintf(buf, "Servers:");
	buf += length;

	i = 0;		i = 0;
	read_lock(&GlobalSMBSeslock);		read_lock(&GlobalSMBSeslock);
	@@ -142,11 +130,10 @@ cifs_debug_data_read(char buf, char *beginBuffer, off_t offset,
	ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList);		ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList);
	if ((ses->serverDomain == NULL) \|\| (ses->serverOS == NULL) \|\|		if ((ses->serverDomain == NULL) \|\| (ses->serverOS == NULL) \|\|
	(ses->serverNOS == NULL)) {		(ses->serverNOS == NULL)) {
	buf += sprintf(buf, "\nentry for %s not fully "		seq_printf(m, "\nentry for %s not fully "
	"displayed\n\t", ses->serverName);		"displayed\n\t", ses->serverName);
	} else {		} else {
	length =		seq_printf(m,
	sprintf(buf,
	"\n%d) Name: %s Domain: %s Mounts: %d OS:"		"\n%d) Name: %s Domain: %s Mounts: %d OS:"
	" %s \n\tNOS: %s\tCapability: 0x%x\n\tSMB"		" %s \n\tNOS: %s\tCapability: 0x%x\n\tSMB"
	" session status: %d\t",		" session status: %d\t",
	@@ -154,10 +141,9 @@ cifs_debug_data_read(char buf, char *beginBuffer, off_t offset,
	atomic_read(&ses->inUse),		atomic_read(&ses->inUse),
	ses->serverOS, ses->serverNOS,		ses->serverOS, ses->serverNOS,
	ses->capabilities, ses->status);		ses->capabilities, ses->status);
	buf += length;
	}		}
	if (ses->server) {		if (ses->server) {
	buf += sprintf(buf, "TCP status: %d\n\tLocal Users To "		seq_printf(m, "TCP status: %d\n\tLocal Users To "
	"Server: %d SecMode: 0x%x Req On Wire: %d",		"Server: %d SecMode: 0x%x Req On Wire: %d",
	ses->server->tcpStatus,		ses->server->tcpStatus,
	atomic_read(&ses->server->socketUseCount),		atomic_read(&ses->server->socketUseCount),
	@@ -165,13 +151,12 @@ cifs_debug_data_read(char buf, char *beginBuffer, off_t offset,
	atomic_read(&ses->server->inFlight));		atomic_read(&ses->server->inFlight));

	#ifdef CONFIG_CIFS_STATS2		#ifdef CONFIG_CIFS_STATS2
	buf += sprintf(buf, " In Send: %d In MaxReq Wait: %d",		seq_printf(m, " In Send: %d In MaxReq Wait: %d",
	atomic_read(&ses->server->inSend),		atomic_read(&ses->server->inSend),
	atomic_read(&ses->server->num_waiters));		atomic_read(&ses->server->num_waiters));
	#endif		#endif

	length = sprintf(buf, "\nMIDs:\n");		seq_puts(m, "\nMIDs:\n");
	buf += length;

	spin_lock(&GlobalMid_Lock);		spin_lock(&GlobalMid_Lock);
	list_for_each(tmp1, &ses->server->pending_mid_q) {		list_for_each(tmp1, &ses->server->pending_mid_q) {
	@@ -179,7 +164,7 @@ cifs_debug_data_read(char buf, char *beginBuffer, off_t offset,
	mid_q_entry,		mid_q_entry,
	qhead);		qhead);
	if (mid_entry) {		if (mid_entry) {
	length = sprintf(buf,		seq_printf(m,
	"State: %d com: %d pid:"		"State: %d com: %d pid:"
	" %d tsk: %p mid %d\n",		" %d tsk: %p mid %d\n",
	mid_entry->midState,		mid_entry->midState,
	@@ -187,7 +172,6 @@ cifs_debug_data_read(char buf, char *beginBuffer, off_t offset,
	mid_entry->pid,		mid_entry->pid,
	mid_entry->tsk,		mid_entry->tsk,
	mid_entry->mid);		mid_entry->mid);
	buf += length;
	}		}
	}		}
	spin_unlock(&GlobalMid_Lock);		spin_unlock(&GlobalMid_Lock);
	@@ -195,11 +179,9 @@ cifs_debug_data_read(char buf, char *beginBuffer, off_t offset,

	}		}
	read_unlock(&GlobalSMBSeslock);		read_unlock(&GlobalSMBSeslock);
	sprintf(buf, "\n");		seq_putc(m, '\n');
	buf++;

	length = sprintf(buf, "Shares:");		seq_puts(m, "Shares:");
	buf += length;

	i = 0;		i = 0;
	read_lock(&GlobalSMBSeslock);		read_lock(&GlobalSMBSeslock);
	@@ -208,62 +190,52 @@ cifs_debug_data_read(char buf, char *beginBuffer, off_t offset,
	i++;		i++;
	tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);		tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
	dev_type = le32_to_cpu(tcon->fsDevInfo.DeviceType);		dev_type = le32_to_cpu(tcon->fsDevInfo.DeviceType);
	length = sprintf(buf, "\n%d) %s Uses: %d ", i,		seq_printf(m, "\n%d) %s Uses: %d ", i,
	tcon->treeName, atomic_read(&tcon->useCount));		tcon->treeName, atomic_read(&tcon->useCount));
	buf += length;
	if (tcon->nativeFileSystem) {		if (tcon->nativeFileSystem) {
	length = sprintf(buf, "Type: %s ",		seq_printf(m, "Type: %s ",
	tcon->nativeFileSystem);		tcon->nativeFileSystem);
	buf += length;
	}		}
	length = sprintf(buf, "DevInfo: 0x%x Attributes: 0x%x"		seq_printf(m, "DevInfo: 0x%x Attributes: 0x%x"
	"\nPathComponentMax: %d Status: %d",		"\nPathComponentMax: %d Status: %d",
	le32_to_cpu(tcon->fsDevInfo.DeviceCharacteristics),		le32_to_cpu(tcon->fsDevInfo.DeviceCharacteristics),
	le32_to_cpu(tcon->fsAttrInfo.Attributes),		le32_to_cpu(tcon->fsAttrInfo.Attributes),
	le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength),		le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength),
	tcon->tidStatus);		tcon->tidStatus);
	buf += length;
	if (dev_type == FILE_DEVICE_DISK)		if (dev_type == FILE_DEVICE_DISK)
	length = sprintf(buf, " type: DISK ");		seq_puts(m, " type: DISK ");
	else if (dev_type == FILE_DEVICE_CD_ROM)		else if (dev_type == FILE_DEVICE_CD_ROM)
	length = sprintf(buf, " type: CDROM ");		seq_puts(m, " type: CDROM ");
	else		else
	length =		seq_printf(m, " type: %d ", dev_type);
	sprintf(buf, " type: %d ", dev_type);
	buf += length;		if (tcon->tidStatus == CifsNeedReconnect)
	if (tcon->tidStatus == CifsNeedReconnect) {		seq_puts(m, "\tDISCONNECTED ");
	buf += sprintf(buf, "\tDISCONNECTED ");
	length += 14;
	}
	}		}
	read_unlock(&GlobalSMBSeslock);		read_unlock(&GlobalSMBSeslock);

	length = sprintf(buf, "\n");		seq_putc(m, '\n');
	buf += length;

	/* BB add code to dump additional info such as TCP session info now */		/* BB add code to dump additional info such as TCP session info now */
	/* Now calculate total size of returned data */
	length = buf - original_buf;

	if (offset + count >= length)
	*eof = 1;
	if (length < offset) {
	*eof = 1;
	return 0;		return 0;
	} else {
	length = length - offset;
	}		}
	if (length > count)
	length = count;

	return length;		static int cifs_debug_data_proc_open(struct inode inode, struct file file)
			{
			return single_open(file, cifs_debug_data_proc_show, NULL);
	}		}

	#ifdef CONFIG_CIFS_STATS		static const struct file_operations cifs_debug_data_proc_fops = {
			.owner = THIS_MODULE,
			.open = cifs_debug_data_proc_open,
			.read = seq_read,
			.llseek = seq_lseek,
			.release = single_release,
			};

	static int		#ifdef CONFIG_CIFS_STATS
	cifs_stats_write(struct file file, const char __user buffer,		static ssize_t cifs_stats_proc_write(struct file *file,
	unsigned long count, void *data)		const char __user buffer, size_t count, loff_t ppos)
	{		{
	char c;		char c;
	int rc;		int rc;
	@@ -307,236 +279,132 @@ cifs_stats_write(struct file file, const char __user buffer,
	return count;		return count;
	}		}

	static int		static int cifs_stats_proc_show(struct seq_file m, void v)
	cifs_stats_read(char buf, char *beginBuffer, off_t offset,
	int count, int eof, void data)
	{		{
	int item_length, i, length;		int i;
	struct list_head *tmp;		struct list_head *tmp;
	struct cifsTconInfo *tcon;		struct cifsTconInfo *tcon;

	*beginBuffer = buf + offset;		seq_printf(m,

	length = sprintf(buf,
	"Resources in use\nCIFS Session: %d\n",		"Resources in use\nCIFS Session: %d\n",
	sesInfoAllocCount.counter);		sesInfoAllocCount.counter);
	buf += length;		seq_printf(m, "Share (unique mount targets): %d\n",
	item_length =
	sprintf(buf, "Share (unique mount targets): %d\n",
	tconInfoAllocCount.counter);		tconInfoAllocCount.counter);
	length += item_length;		seq_printf(m, "SMB Request/Response Buffer: %d Pool size: %d\n",
	buf += item_length;
	item_length =
	sprintf(buf, "SMB Request/Response Buffer: %d Pool size: %d\n",
	bufAllocCount.counter,		bufAllocCount.counter,
	cifs_min_rcv + tcpSesAllocCount.counter);		cifs_min_rcv + tcpSesAllocCount.counter);
	length += item_length;		seq_printf(m, "SMB Small Req/Resp Buffer: %d Pool size: %d\n",
	buf += item_length;
	item_length =
	sprintf(buf, "SMB Small Req/Resp Buffer: %d Pool size: %d\n",
	smBufAllocCount.counter, cifs_min_small);		smBufAllocCount.counter, cifs_min_small);
	length += item_length;
	buf += item_length;
	#ifdef CONFIG_CIFS_STATS2		#ifdef CONFIG_CIFS_STATS2
	item_length = sprintf(buf, "Total Large %d Small %d Allocations\n",		seq_printf(m, "Total Large %d Small %d Allocations\n",
	atomic_read(&totBufAllocCount),		atomic_read(&totBufAllocCount),
	atomic_read(&totSmBufAllocCount));		atomic_read(&totSmBufAllocCount));
	length += item_length;
	buf += item_length;
	#endif /* CONFIG_CIFS_STATS2 */		#endif /* CONFIG_CIFS_STATS2 */

	item_length =		seq_printf(m, "Operations (MIDs): %d\n", midCount.counter);
	sprintf(buf, "Operations (MIDs): %d\n",		seq_printf(m,
	midCount.counter);
	length += item_length;
	buf += item_length;
	item_length = sprintf(buf,
	"\n%d session %d share reconnects\n",		"\n%d session %d share reconnects\n",
	tcpSesReconnectCount.counter, tconInfoReconnectCount.counter);		tcpSesReconnectCount.counter, tconInfoReconnectCount.counter);
	length += item_length;
	buf += item_length;

	item_length = sprintf(buf,		seq_printf(m,
	"Total vfs operations: %d maximum at one time: %d\n",		"Total vfs operations: %d maximum at one time: %d\n",
	GlobalCurrentXid, GlobalMaxActiveXid);		GlobalCurrentXid, GlobalMaxActiveXid);
	length += item_length;
	buf += item_length;

	i = 0;		i = 0;
	read_lock(&GlobalSMBSeslock);		read_lock(&GlobalSMBSeslock);
	list_for_each(tmp, &GlobalTreeConnectionList) {		list_for_each(tmp, &GlobalTreeConnectionList) {
	i++;		i++;
	tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);		tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
	item_length = sprintf(buf, "\n%d) %s", i, tcon->treeName);		seq_printf(m, "\n%d) %s", i, tcon->treeName);
	buf += item_length;		if (tcon->tidStatus == CifsNeedReconnect)
	length += item_length;		seq_puts(m, "\tDISCONNECTED ");
	if (tcon->tidStatus == CifsNeedReconnect) {		seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
	buf += sprintf(buf, "\tDISCONNECTED ");
	length += 14;
	}
	item_length = sprintf(buf, "\nSMBs: %d Oplock Breaks: %d",
	atomic_read(&tcon->num_smbs_sent),		atomic_read(&tcon->num_smbs_sent),
	atomic_read(&tcon->num_oplock_brks));		atomic_read(&tcon->num_oplock_brks));
	buf += item_length;		seq_printf(m, "\nReads: %d Bytes: %lld",
	length += item_length;
	item_length = sprintf(buf, "\nReads: %d Bytes: %lld",
	atomic_read(&tcon->num_reads),		atomic_read(&tcon->num_reads),
	(long long)(tcon->bytes_read));		(long long)(tcon->bytes_read));
	buf += item_length;		seq_printf(m, "\nWrites: %d Bytes: %lld",
	length += item_length;
	item_length = sprintf(buf, "\nWrites: %d Bytes: %lld",
	atomic_read(&tcon->num_writes),		atomic_read(&tcon->num_writes),
	(long long)(tcon->bytes_written));		(long long)(tcon->bytes_written));
	buf += item_length;		seq_printf(m,
	length += item_length;
	item_length = sprintf(buf,
	"\nLocks: %d HardLinks: %d Symlinks: %d",		"\nLocks: %d HardLinks: %d Symlinks: %d",
	atomic_read(&tcon->num_locks),		atomic_read(&tcon->num_locks),
	atomic_read(&tcon->num_hardlinks),		atomic_read(&tcon->num_hardlinks),
	atomic_read(&tcon->num_symlinks));		atomic_read(&tcon->num_symlinks));
	buf += item_length;
	length += item_length;

	item_length = sprintf(buf, "\nOpens: %d Closes: %d Deletes: %d",		seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
	atomic_read(&tcon->num_opens),		atomic_read(&tcon->num_opens),
	atomic_read(&tcon->num_closes),		atomic_read(&tcon->num_closes),
	atomic_read(&tcon->num_deletes));		atomic_read(&tcon->num_deletes));
	buf += item_length;		seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
	length += item_length;
	item_length = sprintf(buf, "\nMkdirs: %d Rmdirs: %d",
	atomic_read(&tcon->num_mkdirs),		atomic_read(&tcon->num_mkdirs),
	atomic_read(&tcon->num_rmdirs));		atomic_read(&tcon->num_rmdirs));
	buf += item_length;		seq_printf(m, "\nRenames: %d T2 Renames %d",
	length += item_length;
	item_length = sprintf(buf, "\nRenames: %d T2 Renames %d",
	atomic_read(&tcon->num_renames),		atomic_read(&tcon->num_renames),
	atomic_read(&tcon->num_t2renames));		atomic_read(&tcon->num_t2renames));
	buf += item_length;		seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
	length += item_length;
	item_length = sprintf(buf, "\nFindFirst: %d FNext %d FClose %d",
	atomic_read(&tcon->num_ffirst),		atomic_read(&tcon->num_ffirst),
	atomic_read(&tcon->num_fnext),		atomic_read(&tcon->num_fnext),
	atomic_read(&tcon->num_fclose));		atomic_read(&tcon->num_fclose));
	buf += item_length;
	length += item_length;
	}		}
	read_unlock(&GlobalSMBSeslock);		read_unlock(&GlobalSMBSeslock);

	buf += sprintf(buf, "\n");		seq_putc(m, '\n');
	length++;

	if (offset + count >= length)
	*eof = 1;
	if (length < offset) {
	*eof = 1;
	return 0;		return 0;
	} else {
	length = length - offset;
	}		}
	if (length > count)
	length = count;

	return length;		static int cifs_stats_proc_open(struct inode inode, struct file file)
			{
			return single_open(file, cifs_stats_proc_show, NULL);
	}		}

			static const struct file_operations cifs_stats_proc_fops = {
			.owner = THIS_MODULE,
			.open = cifs_stats_proc_open,
			.read = seq_read,
			.llseek = seq_lseek,
			.release = single_release,
			.write = cifs_stats_proc_write,
			};
	#endif /* STATS */		#endif /* STATS */

	static struct proc_dir_entry *proc_fs_cifs;		static struct proc_dir_entry *proc_fs_cifs;
	read_proc_t cifs_txanchor_read;		static const struct file_operations cifsFYI_proc_fops;
	static read_proc_t cifsFYI_read;		static const struct file_operations cifs_oplock_proc_fops;
	static write_proc_t cifsFYI_write;		static const struct file_operations cifs_lookup_cache_proc_fops;
	static read_proc_t oplockEnabled_read;		static const struct file_operations traceSMB_proc_fops;
	static write_proc_t oplockEnabled_write;		static const struct file_operations cifs_multiuser_mount_proc_fops;
	static read_proc_t lookupFlag_read;		static const struct file_operations cifs_security_flags_proc_fops;
	static write_proc_t lookupFlag_write;		static const struct file_operations cifs_experimental_proc_fops;
	static read_proc_t traceSMB_read;		static const struct file_operations cifs_linux_ext_proc_fops;
	static write_proc_t traceSMB_write;
	static read_proc_t multiuser_mount_read;
	static write_proc_t multiuser_mount_write;
	static read_proc_t security_flags_read;
	static write_proc_t security_flags_write;
	/* static read_proc_t ntlmv2_enabled_read;
	static write_proc_t ntlmv2_enabled_write;
	static read_proc_t packet_signing_enabled_read;
	static write_proc_t packet_signing_enabled_write;*/
	static read_proc_t experimEnabled_read;
	static write_proc_t experimEnabled_write;
	static read_proc_t linuxExtensionsEnabled_read;
	static write_proc_t linuxExtensionsEnabled_write;

	void		void
	cifs_proc_init(void)		cifs_proc_init(void)
	{		{
	struct proc_dir_entry *pde;

	proc_fs_cifs = proc_mkdir("fs/cifs", NULL);		proc_fs_cifs = proc_mkdir("fs/cifs", NULL);
	if (proc_fs_cifs == NULL)		if (proc_fs_cifs == NULL)
	return;		return;

	proc_fs_cifs->owner = THIS_MODULE;		proc_fs_cifs->owner = THIS_MODULE;
	create_proc_read_entry("DebugData", 0, proc_fs_cifs,		proc_create("DebugData", 0, proc_fs_cifs, &cifs_debug_data_proc_fops);
	cifs_debug_data_read, NULL);

	#ifdef CONFIG_CIFS_STATS		#ifdef CONFIG_CIFS_STATS
	pde = create_proc_read_entry("Stats", 0, proc_fs_cifs,		proc_create("Stats", 0, proc_fs_cifs, &cifs_stats_proc_fops);
	cifs_stats_read, NULL);
	if (pde)
	pde->write_proc = cifs_stats_write;
	#endif /* STATS */		#endif /* STATS */
	pde = create_proc_read_entry("cifsFYI", 0, proc_fs_cifs,		proc_create("cifsFYI", 0, proc_fs_cifs, &cifsFYI_proc_fops);
	cifsFYI_read, NULL);		proc_create("traceSMB", 0, proc_fs_cifs, &traceSMB_proc_fops);
	if (pde)		proc_create("OplockEnabled", 0, proc_fs_cifs, &cifs_oplock_proc_fops);
	pde->write_proc = cifsFYI_write;		proc_create("Experimental", 0, proc_fs_cifs,
			&cifs_experimental_proc_fops);
	pde =		proc_create("LinuxExtensionsEnabled", 0, proc_fs_cifs,
	create_proc_read_entry("traceSMB", 0, proc_fs_cifs,		&cifs_linux_ext_proc_fops);
	traceSMB_read, NULL);		proc_create("MultiuserMount", 0, proc_fs_cifs,
	if (pde)		&cifs_multiuser_mount_proc_fops);
	pde->write_proc = traceSMB_write;		proc_create("SecurityFlags", 0, proc_fs_cifs,
			&cifs_security_flags_proc_fops);
	pde = create_proc_read_entry("OplockEnabled", 0, proc_fs_cifs,		proc_create("LookupCacheEnabled", 0, proc_fs_cifs,
	oplockEnabled_read, NULL);		&cifs_lookup_cache_proc_fops);
	if (pde)
	pde->write_proc = oplockEnabled_write;

	pde = create_proc_read_entry("Experimental", 0, proc_fs_cifs,
	experimEnabled_read, NULL);
	if (pde)
	pde->write_proc = experimEnabled_write;

	pde = create_proc_read_entry("LinuxExtensionsEnabled", 0, proc_fs_cifs,
	linuxExtensionsEnabled_read, NULL);
	if (pde)
	pde->write_proc = linuxExtensionsEnabled_write;

	pde =
	create_proc_read_entry("MultiuserMount", 0, proc_fs_cifs,
	multiuser_mount_read, NULL);
	if (pde)
	pde->write_proc = multiuser_mount_write;

	pde =
	create_proc_read_entry("SecurityFlags", 0, proc_fs_cifs,
	security_flags_read, NULL);
	if (pde)
	pde->write_proc = security_flags_write;

	pde =
	create_proc_read_entry("LookupCacheEnabled", 0, proc_fs_cifs,
	lookupFlag_read, NULL);
	if (pde)
	pde->write_proc = lookupFlag_write;

	/* pde =
	create_proc_read_entry("NTLMV2Enabled", 0, proc_fs_cifs,
	ntlmv2_enabled_read, NULL);
	if (pde)
	pde->write_proc = ntlmv2_enabled_write;

	pde =
	create_proc_read_entry("PacketSigningEnabled", 0, proc_fs_cifs,
	packet_signing_enabled_read, NULL);
	if (pde)
	pde->write_proc = packet_signing_enabled_write;*/
	}		}

	void		void
	@@ -553,39 +421,26 @@ cifs_proc_clean(void)
	#endif		#endif
	remove_proc_entry("MultiuserMount", proc_fs_cifs);		remove_proc_entry("MultiuserMount", proc_fs_cifs);
	remove_proc_entry("OplockEnabled", proc_fs_cifs);		remove_proc_entry("OplockEnabled", proc_fs_cifs);
	/* remove_proc_entry("NTLMV2Enabled",proc_fs_cifs); */
	remove_proc_entry("SecurityFlags", proc_fs_cifs);		remove_proc_entry("SecurityFlags", proc_fs_cifs);
	/* remove_proc_entry("PacketSigningEnabled", proc_fs_cifs); */
	remove_proc_entry("LinuxExtensionsEnabled", proc_fs_cifs);		remove_proc_entry("LinuxExtensionsEnabled", proc_fs_cifs);
	remove_proc_entry("Experimental", proc_fs_cifs);		remove_proc_entry("Experimental", proc_fs_cifs);
	remove_proc_entry("LookupCacheEnabled", proc_fs_cifs);		remove_proc_entry("LookupCacheEnabled", proc_fs_cifs);
	remove_proc_entry("fs/cifs", NULL);		remove_proc_entry("fs/cifs", NULL);
	}		}

	static int		static int cifsFYI_proc_show(struct seq_file m, void v)
	cifsFYI_read(char page, char *start, off_t off, int count,
	int eof, void data)
	{		{
	int len;		seq_printf(m, "%d\n", cifsFYI);
			return 0;
	len = sprintf(page, "%d\n", cifsFYI);		}

	len -= off;
	*start = page + off;

	if (len > count)
	len = count;
	else
	*eof = 1;

	if (len < 0)
	len = 0;

	return len;		static int cifsFYI_proc_open(struct inode inode, struct file file)
			{
			return single_open(file, cifsFYI_proc_show, NULL);
	}		}
	static int
	cifsFYI_write(struct file file, const char __user buffer,		static ssize_t cifsFYI_proc_write(struct file file, const char __user buffer,
	unsigned long count, void *data)		size_t count, loff_t *ppos)
	{		{
	char c;		char c;
	int rc;		int rc;
	@@ -603,30 +458,28 @@ cifsFYI_write(struct file file, const char __user buffer,
	return count;		return count;
	}		}

	static int		static const struct file_operations cifsFYI_proc_fops = {
	oplockEnabled_read(char page, char *start, off_t off,		.owner = THIS_MODULE,
	int count, int eof, void data)		.open = cifsFYI_proc_open,
	{		.read = seq_read,
	int len;		.llseek = seq_lseek,
			.release = single_release,
	len = sprintf(page, "%d\n", oplockEnabled);		.write = cifsFYI_proc_write,
			};
	len -= off;
	*start = page + off;

	if (len > count)
	len = count;
	else
	*eof = 1;

	if (len < 0)		static int cifs_oplock_proc_show(struct seq_file m, void v)
	len = 0;		{
			seq_printf(m, "%d\n", oplockEnabled);
			return 0;
			}

	return len;		static int cifs_oplock_proc_open(struct inode inode, struct file file)
			{
			return single_open(file, cifs_oplock_proc_show, NULL);
	}		}
	static int
	oplockEnabled_write(struct file file, const char __user buffer,		static ssize_t cifs_oplock_proc_write(struct file *file,
	unsigned long count, void *data)		const char __user buffer, size_t count, loff_t ppos)
	{		{
	char c;		char c;
	int rc;		int rc;
	@@ -642,30 +495,28 @@ oplockEnabled_write(struct file file, const char __user buffer,
	return count;		return count;
	}		}

	static int		static const struct file_operations cifs_oplock_proc_fops = {
	experimEnabled_read(char page, char *start, off_t off,		.owner = THIS_MODULE,
	int count, int eof, void data)		.open = cifs_oplock_proc_open,
	{		.read = seq_read,
	int len;		.llseek = seq_lseek,
			.release = single_release,
			.write = cifs_oplock_proc_write,
			};

	len = sprintf(page, "%d\n", experimEnabled);		static int cifs_experimental_proc_show(struct seq_file m, void v)
			{
	len -= off;		seq_printf(m, "%d\n", experimEnabled);
	*start = page + off;		return 0;
			}
	if (len > count)
	len = count;
	else
	*eof = 1;

	if (len < 0)
	len = 0;

	return len;		static int cifs_experimental_proc_open(struct inode inode, struct file file)
			{
			return single_open(file, cifs_experimental_proc_show, NULL);
	}		}
	static int
	experimEnabled_write(struct file file, const char __user buffer,		static ssize_t cifs_experimental_proc_write(struct file *file,
	unsigned long count, void *data)		const char __user buffer, size_t count, loff_t ppos)
	{		{
	char c;		char c;
	int rc;		int rc;
	@@ -683,29 +534,28 @@ experimEnabled_write(struct file file, const char __user buffer,
	return count;		return count;
	}		}

	static int		static const struct file_operations cifs_experimental_proc_fops = {
	linuxExtensionsEnabled_read(char page, char *start, off_t off,		.owner = THIS_MODULE,
	int count, int eof, void data)		.open = cifs_experimental_proc_open,
	{		.read = seq_read,
	int len;		.llseek = seq_lseek,
			.release = single_release,
	len = sprintf(page, "%d\n", linuxExtEnabled);		.write = cifs_experimental_proc_write,
	len -= off;		};
	*start = page + off;

	if (len > count)		static int cifs_linux_ext_proc_show(struct seq_file m, void v)
	len = count;		{
	else		seq_printf(m, "%d\n", linuxExtEnabled);
	*eof = 1;		return 0;
			}
	if (len < 0)
	len = 0;

	return len;		static int cifs_linux_ext_proc_open(struct inode inode, struct file file)
			{
			return single_open(file, cifs_linux_ext_proc_show, NULL);
	}		}
	static int
	linuxExtensionsEnabled_write(struct file file, const char __user buffer,		static ssize_t cifs_linux_ext_proc_write(struct file *file,
	unsigned long count, void *data)		const char __user buffer, size_t count, loff_t ppos)
	{		{
	char c;		char c;
	int rc;		int rc;
	@@ -721,31 +571,28 @@ linuxExtensionsEnabled_write(struct file file, const char __user buffer,
	return count;		return count;
	}		}

			static const struct file_operations cifs_linux_ext_proc_fops = {
			.owner = THIS_MODULE,
			.open = cifs_linux_ext_proc_open,
			.read = seq_read,
			.llseek = seq_lseek,
			.release = single_release,
			.write = cifs_linux_ext_proc_write,
			};

	static int		static int cifs_lookup_cache_proc_show(struct seq_file m, void v)
	lookupFlag_read(char page, char *start, off_t off,
	int count, int eof, void data)
	{		{
	int len;		seq_printf(m, "%d\n", lookupCacheEnabled);
			return 0;
	len = sprintf(page, "%d\n", lookupCacheEnabled);		}

	len -= off;
	*start = page + off;

	if (len > count)
	len = count;
	else
	*eof = 1;

	if (len < 0)
	len = 0;

	return len;		static int cifs_lookup_cache_proc_open(struct inode inode, struct file file)
			{
			return single_open(file, cifs_lookup_cache_proc_show, NULL);
	}		}
	static int
	lookupFlag_write(struct file file, const char __user buffer,		static ssize_t cifs_lookup_cache_proc_write(struct file *file,
	unsigned long count, void *data)		const char __user buffer, size_t count, loff_t ppos)
	{		{
	char c;		char c;
	int rc;		int rc;
	@@ -760,30 +607,29 @@ lookupFlag_write(struct file file, const char __user buffer,

	return count;		return count;
	}		}
	static int
	traceSMB_read(char page, char *start, off_t off, int count,
	int eof, void data)
	{
	int len;

	len = sprintf(page, "%d\n", traceSMB);

	len -= off;		static const struct file_operations cifs_lookup_cache_proc_fops = {
	*start = page + off;		.owner = THIS_MODULE,
			.open = cifs_lookup_cache_proc_open,
			.read = seq_read,
			.llseek = seq_lseek,
			.release = single_release,
			.write = cifs_lookup_cache_proc_write,
			};

	if (len > count)		static int traceSMB_proc_show(struct seq_file m, void v)
	len = count;		{
	else		seq_printf(m, "%d\n", traceSMB);
	*eof = 1;		return 0;
			}
	if (len < 0)
	len = 0;

	return len;		static int traceSMB_proc_open(struct inode inode, struct file file)
			{
			return single_open(file, traceSMB_proc_show, NULL);
	}		}
	static int
	traceSMB_write(struct file file, const char __user buffer,		static ssize_t traceSMB_proc_write(struct file file, const char __user buffer,
	unsigned long count, void *data)		size_t count, loff_t *ppos)
	{		{
	char c;		char c;
	int rc;		int rc;
	@@ -799,30 +645,28 @@ traceSMB_write(struct file file, const char __user buffer,
	return count;		return count;
	}		}

	static int		static const struct file_operations traceSMB_proc_fops = {
	multiuser_mount_read(char page, char *start, off_t off,		.owner = THIS_MODULE,
	int count, int eof, void data)		.open = traceSMB_proc_open,
	{		.read = seq_read,
	int len;		.llseek = seq_lseek,
			.release = single_release,
	len = sprintf(page, "%d\n", multiuser_mount);		.write = traceSMB_proc_write,
			};
	len -= off;
	*start = page + off;

	if (len > count)
	len = count;
	else
	*eof = 1;

	if (len < 0)		static int cifs_multiuser_mount_proc_show(struct seq_file m, void v)
	len = 0;		{
			seq_printf(m, "%d\n", multiuser_mount);
			return 0;
			}

	return len;		static int cifs_multiuser_mount_proc_open(struct inode inode, struct file fh)
			{
			return single_open(fh, cifs_multiuser_mount_proc_show, NULL);
	}		}
	static int
	multiuser_mount_write(struct file file, const char __user buffer,		static ssize_t cifs_multiuser_mount_proc_write(struct file *file,
	unsigned long count, void *data)		const char __user buffer, size_t count, loff_t ppos)
	{		{
	char c;		char c;
	int rc;		int rc;
	@@ -838,30 +682,28 @@ multiuser_mount_write(struct file file, const char __user buffer,
	return count;		return count;
	}		}

	static int		static const struct file_operations cifs_multiuser_mount_proc_fops = {
	security_flags_read(char page, char *start, off_t off,		.owner = THIS_MODULE,
	int count, int eof, void data)		.open = cifs_multiuser_mount_proc_open,
	{		.read = seq_read,
	int len;		.llseek = seq_lseek,
			.release = single_release,
	len = sprintf(page, "0x%x\n", extended_security);		.write = cifs_multiuser_mount_proc_write,
			};
	len -= off;
	*start = page + off;

	if (len > count)		static int cifs_security_flags_proc_show(struct seq_file m, void v)
	len = count;		{
	else		seq_printf(m, "0x%x\n", extended_security);
	*eof = 1;		return 0;
			}
	if (len < 0)
	len = 0;

	return len;		static int cifs_security_flags_proc_open(struct inode inode, struct file file)
			{
			return single_open(file, cifs_security_flags_proc_show, NULL);
	}		}
	static int
	security_flags_write(struct file file, const char __user buffer,		static ssize_t cifs_security_flags_proc_write(struct file *file,
	unsigned long count, void *data)		const char __user buffer, size_t count, loff_t ppos)
	{		{
	unsigned int flags;		unsigned int flags;
	char flags_string[12];		char flags_string[12];
	@@ -917,6 +759,15 @@ security_flags_write(struct file file, const char __user buffer,
	/* BB should we turn on MAY flags for other MUST options? */		/* BB should we turn on MAY flags for other MUST options? */
	return count;		return count;
	}		}

			static const struct file_operations cifs_security_flags_proc_fops = {
			.owner = THIS_MODULE,
			.open = cifs_security_flags_proc_open,
			.read = seq_read,
			.llseek = seq_lseek,
			.release = single_release,
			.write = cifs_security_flags_proc_write,
			};
	#else		#else
	inline void cifs_proc_init(void)		inline void cifs_proc_init(void)
	{		{

Admin message