projects
/
linux-flexiantxendom0-3.2.10.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
39d6411
)
Merge git://git.samba.org/sfrench/cifs-2.6
author
Linus Torvalds <torvalds@linux-foundation.org>
Wed, 16 May 2012 21:22:38 +0000
(14:22 -0700)
committer
Linus Torvalds <torvalds@linux-foundation.org>
Wed, 16 May 2012 21:22:38 +0000
(14:22 -0700)
Pull CIFS fix from Jeff Layton
* git://git.samba.org/sfrench/cifs-2.6:
cifs: fix misspelling of "forcedirectio"
fs/cifs/connect.c
patch
|
blob
|
history
diff --git
a/fs/cifs/connect.c
b/fs/cifs/connect.c
index
5dcc551
..
e0b56d7
100644
(file)
--- a/
fs/cifs/connect.c
+++ b/
fs/cifs/connect.c
@@
-164,7
+164,8
@@
static const match_table_t cifs_mount_option_tokens = {
{ Opt_sign, "sign" },
{ Opt_seal, "seal" },
{ Opt_direct, "direct" },
- { Opt_direct, "forceddirectio" },
+ { Opt_direct, "directio" },
+ { Opt_direct, "forcedirectio" },
{ Opt_strictcache, "strictcache" },
{ Opt_noac, "noac" },
{ Opt_fsc, "fsc" },