summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-16 14:22:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-16 14:22:38 -0700
commitdfae359f083fac3a884e10b46ebe0f262a9bd97a (patch)
tree25a547a4cb2b1cdac99766c62442c1f73bc50582 /fs
parent39d6411b7df566715138c8c9f7fa00227f4ae75b (diff)
parent531c8ff0d472295f5ef5d1bd306115c81a84889e (diff)
downloadlinux-stable-dfae359f083fac3a884e10b46ebe0f262a9bd97a.tar.gz
linux-stable-dfae359f083fac3a884e10b46ebe0f262a9bd97a.tar.bz2
linux-stable-dfae359f083fac3a884e10b46ebe0f262a9bd97a.zip
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"
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/connect.c3
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 = {
{ 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" },