forked from Sricharanti/sricharan
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French * git://git.samba.org/sfrench/cifs-2.6: cifs: clean up ordering in exit_cifs cifs: clean up call to cifs_dfs_release_automount_timer() CIFS: Delete echo_retries module parm CIFS: Prepare credits code for a slot reservation CIFS: Make wait_for_free_request killable CIFS: Introduce credit-based flow control CIFS: Simplify inFlight logic cifs: fix issue mounting of DFS ROOT when redirecting from one domain controller to the next CIFS: Respect negotiated MaxMpxCount CIFS: Fix a spurious error in cifs_push_posix_locks
- Loading branch information
Showing
11 changed files
with
169 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -76,12 +76,7 @@ MODULE_PARM_DESC(cifs_min_small, "Small network buffers in pool. Default: 30 " | |
unsigned int cifs_max_pending = CIFS_MAX_REQ; | ||
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; | ||
module_param(echo_retries, ushort, 0644); | ||
MODULE_PARM_DESC(echo_retries, "Number of echo attempts before giving up and " | ||
"reconnecting server. Default: 5. 0 means " | ||
"never reconnect."); | ||
"Default: 32767 Range: 2 to 32767."); | ||
module_param(enable_oplocks, bool, 0644); | ||
MODULE_PARM_DESC(enable_oplocks, "Enable or disable oplocks (bool). Default:" | ||
"y/Y/1"); | ||
|
@@ -1111,9 +1106,9 @@ init_cifs(void) | |
if (cifs_max_pending < 2) { | ||
cifs_max_pending = 2; | ||
cFYI(1, "cifs_max_pending set to min of 2"); | ||
} else if (cifs_max_pending > 256) { | ||
cifs_max_pending = 256; | ||
cFYI(1, "cifs_max_pending set to max of 256"); | ||
} else if (cifs_max_pending > CIFS_MAX_REQ) { | ||
cifs_max_pending = CIFS_MAX_REQ; | ||
cFYI(1, "cifs_max_pending set to max of %u", CIFS_MAX_REQ); | ||
} | ||
|
||
rc = cifs_fscache_register(); | ||
|
@@ -1175,22 +1170,20 @@ static void __exit | |
exit_cifs(void) | ||
{ | ||
cFYI(DBG2, "exit_cifs"); | ||
cifs_proc_clean(); | ||
cifs_fscache_unregister(); | ||
#ifdef CONFIG_CIFS_DFS_UPCALL | ||
unregister_filesystem(&cifs_fs_type); | ||
cifs_dfs_release_automount_timer(); | ||
#endif | ||
#ifdef CONFIG_CIFS_ACL | ||
cifs_destroy_idmaptrees(); | ||
exit_cifs_idmap(); | ||
#endif | ||
#ifdef CONFIG_CIFS_UPCALL | ||
unregister_key_type(&cifs_spnego_key_type); | ||
#endif | ||
unregister_filesystem(&cifs_fs_type); | ||
cifs_destroy_inodecache(); | ||
cifs_destroy_mids(); | ||
cifs_destroy_request_bufs(); | ||
cifs_destroy_mids(); | ||
cifs_destroy_inodecache(); | ||
cifs_fscache_unregister(); | ||
cifs_proc_clean(); | ||
} | ||
|
||
MODULE_AUTHOR("Steve French <[email protected]>"); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.