From: Jeff Layton <jlayton@samba.org>
Date: Mon, 29 Jun 2009 10:16:38 +0000 (-0400)
Subject: mount.cifs: don't pass text ro/rw options to kernel
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=595d07d0ab494e3749c71caf86887ad1cebda229;p=abartlet%2Fsamba.git%2F.git

mount.cifs: don't pass text ro/rw options to kernel

/bin/mount strips off the ro/rw options after setting the MS_RDONLY
flag appropriately. Make mount.cifs do the same thing.

Signed-off-by: Jeff Layton <jlayton@samba.org>
---

diff --git a/client/mount.cifs.c b/client/mount.cifs.c
index db05665f96c..4387f5945a9 100644
--- a/client/mount.cifs.c
+++ b/client/mount.cifs.c
@@ -771,8 +771,10 @@ static int parse_options(char ** optionsp, unsigned long * filesys_flags)
 			got_password = 1;
 		} else if (strncmp(data, "ro", 2) == 0) {
 			*filesys_flags |= MS_RDONLY;
+			goto nocopy;
 		} else if (strncmp(data, "rw", 2) == 0) {
 			*filesys_flags &= ~MS_RDONLY;
+			goto nocopy;
                 } else if (strncmp(data, "remount", 7) == 0) {
                         *filesys_flags |= MS_REMOUNT;
 		} /* else if (strnicmp(data, "port", 4) == 0) {