Merge branch 'cifs-3.2' of git://git.samba.org/jlayton/linux into temp-3.2-jeff

This commit is contained in:
Steve French
2011-10-19 21:22:41 -05:00
9 changed files with 899 additions and 370 deletions

View File

@@ -74,7 +74,7 @@ module_param(cifs_min_small, int, 0);
MODULE_PARM_DESC(cifs_min_small, "Small network buffers in pool. Default: 30 "
"Range: 2 to 256");
unsigned int cifs_max_pending = CIFS_MAX_REQ;
module_param(cifs_max_pending, int, 0);
module_param(cifs_max_pending, int, 0444);
MODULE_PARM_DESC(cifs_max_pending, "Simultaneous requests to server. "
"Default: 50 Range: 2 to 256");
unsigned short echo_retries = 5;