diff options
Diffstat (limited to 'fs/cifs/cifs_debug.c')
| -rw-r--r-- | fs/cifs/cifs_debug.c | 14 | 
1 files changed, 11 insertions, 3 deletions
diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c index 84e8c072470..573b899b5a5 100644 --- a/fs/cifs/cifs_debug.c +++ b/fs/cifs/cifs_debug.c @@ -171,8 +171,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)  			seq_printf(m, "TCP status: %d\n\tLocal Users To "  				   "Server: %d SecMode: 0x%x Req On Wire: %d",  				   server->tcpStatus, server->srv_count, -				   server->sec_mode, -				   atomic_read(&server->inFlight)); +				   server->sec_mode, in_flight(server));  #ifdef CONFIG_CIFS_STATS2  			seq_printf(m, " In Send: %d In MaxReq Wait: %d", @@ -676,14 +675,23 @@ static ssize_t cifs_multiuser_mount_proc_write(struct file *file,  {  	char c;  	int rc; +	static bool warned;  	rc = get_user(c, buffer);  	if (rc)  		return rc;  	if (c == '0' || c == 'n' || c == 'N')  		multiuser_mount = 0; -	else if (c == '1' || c == 'y' || c == 'Y') +	else if (c == '1' || c == 'y' || c == 'Y') {  		multiuser_mount = 1; +		if (!warned) { +			warned = true; +			printk(KERN_WARNING "CIFS VFS: The legacy multiuser " +				"mount code is scheduled to be deprecated in " +				"3.5. Please switch to using the multiuser " +				"mount option."); +		} +	}  	return count;  }  |