diff options
author | Steve French <smfrench@gmail.com> | 2011-10-12 18:47:03 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2011-10-13 00:42:05 -0400 |
commit | e75047344ea415760b2508a6fa29c0288c7b6b68 (patch) | |
tree | 14abdd67059e4d6a33ce149a4474dbaafc75b9b7 /fs/cifs/cifsglob.h | |
parent | ba749e6d5227de22e442c6088cc7dc1f0c5c68bf (diff) |
add new module parameter 'enable_oplocks'
Thus spake Jeff Layton:
"Making that a module parm would allow you to set that parameter at boot
time without needing to add special startup scripts. IMO, all of the
procfile "switches" under /proc/fs/cifs should be module parms
instead."
This patch doesn't alter the default behavior (Oplocks are enabled by
default).
To disable oplocks when loading the module, use
modprobe cifs enable_oplocks=0
(any of '0' or 'n' or 'N' conventions can be used).
To disable oplocks at runtime using the new interface, use
echo 0 > /sys/module/cifs/parameters/enable_oplocks
The older /proc/fs/cifs/OplockEnabled interface will be deprecated
after two releases. A subsequent patch will add an warning message
about this deprecation.
Changes since v2:
- make enable_oplocks a 'bool'
Changes since v1:
- eliminate the use of extra variable by renaming the old one to
enable_oplocks and make it an 'int' type.
Reported-by: Alexander Swen <alex@swen.nu>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r-- | fs/cifs/cifsglob.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 95dad9d14cf1..d734dee9d495 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
@@ -964,7 +964,8 @@ GLOBAL_EXTERN unsigned int multiuser_mount; /* if enabled allows new sessions | |||
964 | to be established on existing mount if we | 964 | to be established on existing mount if we |
965 | have the uid/password or Kerberos credential | 965 | have the uid/password or Kerberos credential |
966 | or equivalent for current user */ | 966 | or equivalent for current user */ |
967 | GLOBAL_EXTERN unsigned int oplockEnabled; | 967 | /* enable or disable oplocks */ |
968 | GLOBAL_EXTERN bool enable_oplocks; | ||
968 | GLOBAL_EXTERN unsigned int lookupCacheEnabled; | 969 | GLOBAL_EXTERN unsigned int lookupCacheEnabled; |
969 | GLOBAL_EXTERN unsigned int global_secflags; /* if on, session setup sent | 970 | GLOBAL_EXTERN unsigned int global_secflags; /* if on, session setup sent |
970 | with more secure ntlmssp2 challenge/resp */ | 971 | with more secure ntlmssp2 challenge/resp */ |