Commit 6459340c authored by Jeff Layton's avatar Jeff Layton Committed by Steve French

cifs: remove rw/ro options

cifs: remove rw/ro options

These options are handled at the VFS layer. They only ever set the
option in the smb_vol struct. Nothing was ever done with them afterward
anyway.
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent b48a4858
...@@ -70,7 +70,6 @@ struct smb_vol { ...@@ -70,7 +70,6 @@ struct smb_vol {
mode_t file_mode; mode_t file_mode;
mode_t dir_mode; mode_t dir_mode;
unsigned secFlg; unsigned secFlg;
bool rw:1;
bool retry:1; bool retry:1;
bool intr:1; bool intr:1;
bool setuids:1; bool setuids:1;
...@@ -832,7 +831,6 @@ cifs_parse_mount_options(char *options, const char *devname, ...@@ -832,7 +831,6 @@ cifs_parse_mount_options(char *options, const char *devname,
vol->dir_mode = vol->file_mode = S_IRUGO | S_IXUGO | S_IWUSR; vol->dir_mode = vol->file_mode = S_IRUGO | S_IXUGO | S_IWUSR;
/* vol->retry default is 0 (i.e. "soft" limited retry not hard retry) */ /* vol->retry default is 0 (i.e. "soft" limited retry not hard retry) */
vol->rw = true;
/* default is always to request posix paths. */ /* default is always to request posix paths. */
vol->posix_paths = 1; vol->posix_paths = 1;
/* default to using server inode numbers where available */ /* default to using server inode numbers where available */
...@@ -1198,8 +1196,6 @@ cifs_parse_mount_options(char *options, const char *devname, ...@@ -1198,8 +1196,6 @@ cifs_parse_mount_options(char *options, const char *devname,
/* ignore */ /* ignore */
} else if (strnicmp(data, "guest", 5) == 0) { } else if (strnicmp(data, "guest", 5) == 0) {
/* ignore */ /* ignore */
} else if (strnicmp(data, "rw", 2) == 0) {
vol->rw = true;
} else if (strnicmp(data, "noblocksend", 11) == 0) { } else if (strnicmp(data, "noblocksend", 11) == 0) {
vol->noblocksnd = 1; vol->noblocksnd = 1;
} else if (strnicmp(data, "noautotune", 10) == 0) { } else if (strnicmp(data, "noautotune", 10) == 0) {
...@@ -1218,8 +1214,6 @@ cifs_parse_mount_options(char *options, const char *devname, ...@@ -1218,8 +1214,6 @@ cifs_parse_mount_options(char *options, const char *devname,
parse these options again and set anything and it parse these options again and set anything and it
is ok to just ignore them */ is ok to just ignore them */
continue; continue;
} else if (strnicmp(data, "ro", 2) == 0) {
vol->rw = false;
} else if (strnicmp(data, "hard", 4) == 0) { } else if (strnicmp(data, "hard", 4) == 0) {
vol->retry = 1; vol->retry = 1;
} else if (strnicmp(data, "soft", 4) == 0) { } else if (strnicmp(data, "soft", 4) == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment