Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfae359f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 39d6411b 531c8ff0

fs/cifs/connect.c

+2 −1
Original line number Diff line number Diff line
@@ -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" },