Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / cifs / cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 25bb97f..a5c996f 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -54,6 +54,7 @@ int cifsFYI = 0;
 int cifsERROR = 1;
 int traceSMB = 0;
 bool enable_oplocks = true;
+bool no_serverino_autodisable = false;
 unsigned int linuxExtEnabled = 1;
 unsigned int lookupCacheEnabled = 1;
 unsigned int multiuser_mount = 0;
@@ -85,6 +86,7 @@ MODULE_PARM_DESC(echo_retries, "Number of echo attempts before giving up and "
 module_param(enable_oplocks, bool, 0644);
 MODULE_PARM_DESC(enable_oplocks, "Enable or disable oplocks (bool). Default:"
                                 "y/Y/1");
+module_param(no_serverino_autodisable, bool, 0644);
 
 extern mempool_t *cifs_sm_req_poolp;
 extern mempool_t *cifs_req_poolp;