From 770702ef90c73bf22d00dd27c53848345bacef8c Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Fri, 26 Jun 2009 04:07:18 +0000
Subject: [PATCH] --- yaml --- r: 154377 b: refs/heads/master c:
 71a394faaad07090af5de5c075ec2f5bca0fbb35 h: refs/heads/master i:   154375:
 5a6dd7a3fb6e7ba0be78517b37e66afe0a3ac160 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/connect.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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) {