Skip to content

Commit 15c7d09

Browse files
Ronnie SahlbergSteve French
authored andcommitted
cifs: move the enum for cifs parameters into fs_context.h
No change to logic, just moving the enum of cifs mount parms into a header Signed-off-by: Ronnie Sahlberg <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 837e3a1 commit 15c7d09

File tree

2 files changed

+97
-57
lines changed

2 files changed

+97
-57
lines changed

fs/cifs/connect.c

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -73,63 +73,6 @@ extern bool disable_legacy_dialects;
7373
/* Drop the connection to not overload the server */
7474
#define NUM_STATUS_IO_TIMEOUT 5
7575

76-
enum {
77-
/* Mount options that take no arguments */
78-
Opt_user_xattr, Opt_nouser_xattr,
79-
Opt_forceuid, Opt_noforceuid,
80-
Opt_forcegid, Opt_noforcegid,
81-
Opt_noblocksend, Opt_noautotune, Opt_nolease,
82-
Opt_hard, Opt_soft, Opt_perm, Opt_noperm, Opt_nodelete,
83-
Opt_mapposix, Opt_nomapposix,
84-
Opt_mapchars, Opt_nomapchars, Opt_sfu,
85-
Opt_nosfu, Opt_nodfs, Opt_posixpaths,
86-
Opt_noposixpaths, Opt_nounix, Opt_unix,
87-
Opt_nocase,
88-
Opt_brl, Opt_nobrl,
89-
Opt_handlecache, Opt_nohandlecache,
90-
Opt_forcemandatorylock, Opt_setuidfromacl, Opt_setuids,
91-
Opt_nosetuids, Opt_dynperm, Opt_nodynperm,
92-
Opt_nohard, Opt_nosoft,
93-
Opt_nointr, Opt_intr,
94-
Opt_nostrictsync, Opt_strictsync,
95-
Opt_serverino, Opt_noserverino,
96-
Opt_rwpidforward, Opt_cifsacl, Opt_nocifsacl,
97-
Opt_acl, Opt_noacl, Opt_locallease,
98-
Opt_sign, Opt_ignore_signature, Opt_seal, Opt_noac,
99-
Opt_fsc, Opt_mfsymlinks,
100-
Opt_multiuser, Opt_sloppy, Opt_nosharesock,
101-
Opt_persistent, Opt_nopersistent,
102-
Opt_resilient, Opt_noresilient,
103-
Opt_domainauto, Opt_rdma, Opt_modesid, Opt_rootfs,
104-
Opt_multichannel, Opt_nomultichannel,
105-
Opt_compress,
106-
107-
/* Mount options which take numeric value */
108-
Opt_backupuid, Opt_backupgid, Opt_uid,
109-
Opt_cruid, Opt_gid, Opt_file_mode,
110-
Opt_dirmode, Opt_port,
111-
Opt_min_enc_offload,
112-
Opt_blocksize, Opt_rsize, Opt_wsize, Opt_actimeo,
113-
Opt_echo_interval, Opt_max_credits, Opt_handletimeout,
114-
Opt_snapshot, Opt_max_channels,
115-
116-
/* Mount options which take string value */
117-
Opt_user, Opt_pass, Opt_ip,
118-
Opt_domain, Opt_srcaddr, Opt_iocharset,
119-
Opt_netbiosname, Opt_servern,
120-
Opt_ver, Opt_vers, Opt_sec, Opt_cache,
121-
122-
/* Mount options to be ignored */
123-
Opt_ignore,
124-
125-
/* Options which could be blank */
126-
Opt_blank_pass,
127-
Opt_blank_user,
128-
Opt_blank_ip,
129-
130-
Opt_err
131-
};
132-
13376
static const match_table_t cifs_mount_option_tokens = {
13477

13578
{ Opt_user_xattr, "user_xattr" },

fs/cifs/fs_context.h

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,103 @@ enum cifs_sec_param {
5353
Opt_sec_err
5454
};
5555

56+
enum cifs_param {
57+
/* Mount options that take no arguments */
58+
Opt_user_xattr, Opt_nouser_xattr,
59+
Opt_forceuid, Opt_noforceuid,
60+
Opt_forcegid, Opt_noforcegid,
61+
Opt_noblocksend,
62+
Opt_noautotune,
63+
Opt_nolease,
64+
Opt_hard, Opt_nohard,
65+
Opt_soft, Opt_nosoft,
66+
Opt_perm, Opt_noperm,
67+
Opt_nodelete,
68+
Opt_mapposix, Opt_nomapposix,
69+
Opt_mapchars,
70+
Opt_nomapchars,
71+
Opt_sfu, Opt_nosfu,
72+
Opt_nodfs,
73+
Opt_posixpaths, Opt_noposixpaths,
74+
Opt_unix, Opt_nounix,
75+
Opt_nocase,
76+
Opt_brl, Opt_nobrl,
77+
Opt_handlecache, Opt_nohandlecache,
78+
Opt_forcemandatorylock,
79+
Opt_setuidfromacl,
80+
Opt_setuids, Opt_nosetuids,
81+
Opt_dynperm, Opt_nodynperm,
82+
Opt_intr, Opt_nointr,
83+
Opt_strictsync, Opt_nostrictsync,
84+
Opt_serverino, Opt_noserverino,
85+
Opt_rwpidforward,
86+
Opt_cifsacl, Opt_nocifsacl,
87+
Opt_acl, Opt_noacl,
88+
Opt_locallease,
89+
Opt_sign,
90+
Opt_ignore_signature,
91+
Opt_seal,
92+
Opt_noac,
93+
Opt_fsc,
94+
Opt_mfsymlinks,
95+
Opt_multiuser,
96+
Opt_sloppy,
97+
Opt_nosharesock,
98+
Opt_persistent, Opt_nopersistent,
99+
Opt_resilient, Opt_noresilient,
100+
Opt_domainauto,
101+
Opt_rdma,
102+
Opt_modesid,
103+
Opt_rootfs,
104+
Opt_multichannel, Opt_nomultichannel,
105+
Opt_compress,
106+
107+
/* Mount options which take numeric value */
108+
Opt_backupuid,
109+
Opt_backupgid,
110+
Opt_uid,
111+
Opt_cruid,
112+
Opt_gid,
113+
Opt_port,
114+
Opt_file_mode,
115+
Opt_dirmode,
116+
Opt_min_enc_offload,
117+
Opt_blocksize,
118+
Opt_rsize,
119+
Opt_wsize,
120+
Opt_actimeo,
121+
Opt_echo_interval,
122+
Opt_max_credits,
123+
Opt_snapshot,
124+
Opt_max_channels,
125+
Opt_handletimeout,
126+
127+
/* Mount options which take string value */
128+
Opt_source,
129+
Opt_user,
130+
Opt_pass,
131+
Opt_ip,
132+
Opt_domain,
133+
Opt_srcaddr,
134+
Opt_iocharset,
135+
Opt_netbiosname,
136+
Opt_servern,
137+
Opt_ver,
138+
Opt_vers,
139+
Opt_sec,
140+
Opt_cache,
141+
142+
/* Mount options to be ignored */
143+
Opt_ignore,
144+
145+
/* Options which could be blank */
146+
Opt_blank_pass,
147+
Opt_blank_user,
148+
Opt_blank_ip,
149+
150+
Opt_err
151+
};
152+
56153
struct smb3_fs_context {
57154
bool uid_specified;
58155
bool gid_specified;

0 commit comments

Comments
 (0)