diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-16 17:22:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-16 17:22:38 -0400 |
commit | dfae359f083fac3a884e10b46ebe0f262a9bd97a (patch) | |
tree | 25a547a4cb2b1cdac99766c62442c1f73bc50582 | |
parent | 39d6411b7df566715138c8c9f7fa00227f4ae75b (diff) | |
parent | 531c8ff0d472295f5ef5d1bd306115c81a84889e (diff) |
Merge git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fix from Jeff Layton
* git://git.samba.org/sfrench/cifs-2.6:
cifs: fix misspelling of "forcedirectio"
-rw-r--r-- | fs/cifs/connect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 5dcc55197fb3..e0b56d7a19c5 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -164,7 +164,8 @@ static const match_table_t cifs_mount_option_tokens = { | |||
164 | { Opt_sign, "sign" }, | 164 | { Opt_sign, "sign" }, |
165 | { Opt_seal, "seal" }, | 165 | { Opt_seal, "seal" }, |
166 | { Opt_direct, "direct" }, | 166 | { Opt_direct, "direct" }, |
167 | { Opt_direct, "forceddirectio" }, | 167 | { Opt_direct, "directio" }, |
168 | { Opt_direct, "forcedirectio" }, | ||
168 | { Opt_strictcache, "strictcache" }, | 169 | { Opt_strictcache, "strictcache" }, |
169 | { Opt_noac, "noac" }, | 170 | { Opt_noac, "noac" }, |
170 | { Opt_fsc, "fsc" }, | 171 | { Opt_fsc, "fsc" }, |