diff --git a/[refs] b/[refs] index 12c93b177fcf..5c2f7ecb9e97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad8034f19792736db5c259103c2eaaf72887bbb4 +refs/heads/master: 71a394faaad07090af5de5c075ec2f5bca0fbb35 diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index 12c2cf693555..e16d7592116a 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -1196,6 +1196,10 @@ cifs_parse_mount_options(char *options, const char *devname, /* ignore */ } else if (strnicmp(data, "guest", 5) == 0) { /* ignore */ + } else if (strnicmp(data, "rw", 2) == 0) { + /* ignore */ + } else if (strnicmp(data, "ro", 2) == 0) { + /* ignore */ } else if (strnicmp(data, "noblocksend", 11) == 0) { vol->noblocksnd = 1; } else if (strnicmp(data, "noautotune", 10) == 0) {