diff options
| author | Jeff Layton <jlayton@redhat.com> | 2009-06-25 00:56:55 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-06-24 22:33:01 -0400 |
| commit | 6459340cfcc6f6d165b27c3dd955aeb55a1b73d3 (patch) | |
| tree | 1dd835d4931f2f02c62b7ac6f4520858ef0f5580 | |
| parent | b48a485884b5afb3e33b1871bcbd246b67491923 (diff) | |
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: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/connect.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 3fb799ff55c9..a581cfa2ba82 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -70,7 +70,6 @@ struct smb_vol { | |||
| 70 | mode_t file_mode; | 70 | mode_t file_mode; |
| 71 | mode_t dir_mode; | 71 | mode_t dir_mode; |
| 72 | unsigned secFlg; | 72 | unsigned secFlg; |
| 73 | bool rw:1; | ||
| 74 | bool retry:1; | 73 | bool retry:1; |
| 75 | bool intr:1; | 74 | bool intr:1; |
| 76 | bool setuids:1; | 75 | bool setuids:1; |
| @@ -832,7 +831,6 @@ cifs_parse_mount_options(char *options, const char *devname, | |||
| 832 | vol->dir_mode = vol->file_mode = S_IRUGO | S_IXUGO | S_IWUSR; | 831 | vol->dir_mode = vol->file_mode = S_IRUGO | S_IXUGO | S_IWUSR; |
| 833 | 832 | ||
| 834 | /* vol->retry default is 0 (i.e. "soft" limited retry not hard retry) */ | 833 | /* vol->retry default is 0 (i.e. "soft" limited retry not hard retry) */ |
| 835 | vol->rw = true; | ||
| 836 | /* default is always to request posix paths. */ | 834 | /* default is always to request posix paths. */ |
| 837 | vol->posix_paths = 1; | 835 | vol->posix_paths = 1; |
| 838 | /* default to using server inode numbers where available */ | 836 | /* default to using server inode numbers where available */ |
| @@ -1198,8 +1196,6 @@ cifs_parse_mount_options(char *options, const char *devname, | |||
| 1198 | /* ignore */ | 1196 | /* ignore */ |
| 1199 | } else if (strnicmp(data, "guest", 5) == 0) { | 1197 | } else if (strnicmp(data, "guest", 5) == 0) { |
| 1200 | /* ignore */ | 1198 | /* ignore */ |
| 1201 | } else if (strnicmp(data, "rw", 2) == 0) { | ||
| 1202 | vol->rw = true; | ||
| 1203 | } else if (strnicmp(data, "noblocksend", 11) == 0) { | 1199 | } else if (strnicmp(data, "noblocksend", 11) == 0) { |
| 1204 | vol->noblocksnd = 1; | 1200 | vol->noblocksnd = 1; |
| 1205 | } else if (strnicmp(data, "noautotune", 10) == 0) { | 1201 | } else if (strnicmp(data, "noautotune", 10) == 0) { |
| @@ -1218,8 +1214,6 @@ cifs_parse_mount_options(char *options, const char *devname, | |||
| 1218 | parse these options again and set anything and it | 1214 | parse these options again and set anything and it |
| 1219 | is ok to just ignore them */ | 1215 | is ok to just ignore them */ |
| 1220 | continue; | 1216 | continue; |
| 1221 | } else if (strnicmp(data, "ro", 2) == 0) { | ||
| 1222 | vol->rw = false; | ||
| 1223 | } else if (strnicmp(data, "hard", 4) == 0) { | 1217 | } else if (strnicmp(data, "hard", 4) == 0) { |
| 1224 | vol->retry = 1; | 1218 | vol->retry = 1; |
| 1225 | } else if (strnicmp(data, "soft", 4) == 0) { | 1219 | } else if (strnicmp(data, "soft", 4) == 0) { |
