diff options
author | Steve French <sfrench@us.ibm.com> | 2011-05-27 00:34:02 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2011-05-27 00:34:02 -0400 |
commit | 96daf2b09178d8ebde2b0d56b027de917c17dfdf (patch) | |
tree | 74802fa44e87925e49067d5106eb762cc27b9b97 /fs/cifs/cifsproto.h | |
parent | 07cc6cf9ef84bcf6a60ee513332bcb0ad5d628d8 (diff) |
[CIFS] Rename three structures to avoid camel case
secMode to sec_mode
and
cifsTconInfo to cifs_tcon
and
cifsSesInfo to cifs_ses
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsproto.h')
-rw-r--r-- | fs/cifs/cifsproto.h | 152 |
1 files changed, 76 insertions, 76 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 17063455918f..953f84413c77 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
@@ -59,7 +59,7 @@ extern void cifs_destroy_idmaptrees(void); | |||
59 | extern char *build_path_from_dentry(struct dentry *); | 59 | extern char *build_path_from_dentry(struct dentry *); |
60 | extern char *cifs_build_path_to_root(struct smb_vol *vol, | 60 | extern char *cifs_build_path_to_root(struct smb_vol *vol, |
61 | struct cifs_sb_info *cifs_sb, | 61 | struct cifs_sb_info *cifs_sb, |
62 | struct cifsTconInfo *tcon); | 62 | struct cifs_tcon *tcon); |
63 | extern char *build_wildcard_path_from_dentry(struct dentry *direntry); | 63 | extern char *build_wildcard_path_from_dentry(struct dentry *direntry); |
64 | extern char *cifs_compose_mount_options(const char *sb_mountdata, | 64 | extern char *cifs_compose_mount_options(const char *sb_mountdata, |
65 | const char *fullpath, const struct dfs_info3_param *ref, | 65 | const char *fullpath, const struct dfs_info3_param *ref, |
@@ -71,19 +71,19 @@ extern void DeleteMidQEntry(struct mid_q_entry *midEntry); | |||
71 | extern int cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov, | 71 | extern int cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov, |
72 | unsigned int nvec, mid_callback_t *callback, | 72 | unsigned int nvec, mid_callback_t *callback, |
73 | void *cbdata, bool ignore_pend); | 73 | void *cbdata, bool ignore_pend); |
74 | extern int SendReceive(const unsigned int /* xid */ , struct cifsSesInfo *, | 74 | extern int SendReceive(const unsigned int /* xid */ , struct cifs_ses *, |
75 | struct smb_hdr * /* input */ , | 75 | struct smb_hdr * /* input */ , |
76 | struct smb_hdr * /* out */ , | 76 | struct smb_hdr * /* out */ , |
77 | int * /* bytes returned */ , const int long_op); | 77 | int * /* bytes returned */ , const int long_op); |
78 | extern int SendReceiveNoRsp(const unsigned int xid, struct cifsSesInfo *ses, | 78 | extern int SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses, |
79 | struct smb_hdr *in_buf, int flags); | 79 | struct smb_hdr *in_buf, int flags); |
80 | extern int cifs_check_receive(struct mid_q_entry *mid, | 80 | extern int cifs_check_receive(struct mid_q_entry *mid, |
81 | struct TCP_Server_Info *server, bool log_error); | 81 | struct TCP_Server_Info *server, bool log_error); |
82 | extern int SendReceive2(const unsigned int /* xid */ , struct cifsSesInfo *, | 82 | extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, |
83 | struct kvec *, int /* nvec to send */, | 83 | struct kvec *, int /* nvec to send */, |
84 | int * /* type of buf returned */ , const int flags); | 84 | int * /* type of buf returned */ , const int flags); |
85 | extern int SendReceiveBlockingLock(const unsigned int xid, | 85 | extern int SendReceiveBlockingLock(const unsigned int xid, |
86 | struct cifsTconInfo *ptcon, | 86 | struct cifs_tcon *ptcon, |
87 | struct smb_hdr *in_buf , | 87 | struct smb_hdr *in_buf , |
88 | struct smb_hdr *out_buf, | 88 | struct smb_hdr *out_buf, |
89 | int *bytes_returned); | 89 | int *bytes_returned); |
@@ -104,12 +104,12 @@ extern int cifs_fill_sockaddr(struct sockaddr *dst, const char *src, int len, | |||
104 | const unsigned short int port); | 104 | const unsigned short int port); |
105 | extern int map_smb_to_linux_error(struct smb_hdr *smb, bool logErr); | 105 | extern int map_smb_to_linux_error(struct smb_hdr *smb, bool logErr); |
106 | extern void header_assemble(struct smb_hdr *, char /* command */ , | 106 | extern void header_assemble(struct smb_hdr *, char /* command */ , |
107 | const struct cifsTconInfo *, int /* length of | 107 | const struct cifs_tcon *, int /* length of |
108 | fixed section (word count) in two byte units */); | 108 | fixed section (word count) in two byte units */); |
109 | extern int small_smb_init_no_tc(const int smb_cmd, const int wct, | 109 | extern int small_smb_init_no_tc(const int smb_cmd, const int wct, |
110 | struct cifsSesInfo *ses, | 110 | struct cifs_ses *ses, |
111 | void **request_buf); | 111 | void **request_buf); |
112 | extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, | 112 | extern int CIFS_SessSetup(unsigned int xid, struct cifs_ses *ses, |
113 | const struct nls_table *nls_cp); | 113 | const struct nls_table *nls_cp); |
114 | extern __u16 GetNextMid(struct TCP_Server_Info *server); | 114 | extern __u16 GetNextMid(struct TCP_Server_Info *server); |
115 | extern struct timespec cifs_NTtimeToUnix(__le64 utc_nanoseconds_since_1601); | 115 | extern struct timespec cifs_NTtimeToUnix(__le64 utc_nanoseconds_since_1601); |
@@ -165,94 +165,94 @@ void cifs_proc_init(void); | |||
165 | void cifs_proc_clean(void); | 165 | void cifs_proc_clean(void); |
166 | 166 | ||
167 | extern int cifs_negotiate_protocol(unsigned int xid, | 167 | extern int cifs_negotiate_protocol(unsigned int xid, |
168 | struct cifsSesInfo *ses); | 168 | struct cifs_ses *ses); |
169 | extern int cifs_setup_session(unsigned int xid, struct cifsSesInfo *ses, | 169 | extern int cifs_setup_session(unsigned int xid, struct cifs_ses *ses, |
170 | struct nls_table *nls_info); | 170 | struct nls_table *nls_info); |
171 | extern int CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses); | 171 | extern int CIFSSMBNegotiate(unsigned int xid, struct cifs_ses *ses); |
172 | 172 | ||
173 | extern int CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, | 173 | extern int CIFSTCon(unsigned int xid, struct cifs_ses *ses, |
174 | const char *tree, struct cifsTconInfo *tcon, | 174 | const char *tree, struct cifs_tcon *tcon, |
175 | const struct nls_table *); | 175 | const struct nls_table *); |
176 | 176 | ||
177 | extern int CIFSFindFirst(const int xid, struct cifsTconInfo *tcon, | 177 | extern int CIFSFindFirst(const int xid, struct cifs_tcon *tcon, |
178 | const char *searchName, const struct nls_table *nls_codepage, | 178 | const char *searchName, const struct nls_table *nls_codepage, |
179 | __u16 *searchHandle, struct cifs_search_info *psrch_inf, | 179 | __u16 *searchHandle, struct cifs_search_info *psrch_inf, |
180 | int map, const char dirsep); | 180 | int map, const char dirsep); |
181 | 181 | ||
182 | extern int CIFSFindNext(const int xid, struct cifsTconInfo *tcon, | 182 | extern int CIFSFindNext(const int xid, struct cifs_tcon *tcon, |
183 | __u16 searchHandle, struct cifs_search_info *psrch_inf); | 183 | __u16 searchHandle, struct cifs_search_info *psrch_inf); |
184 | 184 | ||
185 | extern int CIFSFindClose(const int, struct cifsTconInfo *tcon, | 185 | extern int CIFSFindClose(const int, struct cifs_tcon *tcon, |
186 | const __u16 search_handle); | 186 | const __u16 search_handle); |
187 | 187 | ||
188 | extern int CIFSSMBQFileInfo(const int xid, struct cifsTconInfo *tcon, | 188 | extern int CIFSSMBQFileInfo(const int xid, struct cifs_tcon *tcon, |
189 | u16 netfid, FILE_ALL_INFO *pFindData); | 189 | u16 netfid, FILE_ALL_INFO *pFindData); |
190 | extern int CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon, | 190 | extern int CIFSSMBQPathInfo(const int xid, struct cifs_tcon *tcon, |
191 | const unsigned char *searchName, | 191 | const unsigned char *searchName, |
192 | FILE_ALL_INFO *findData, | 192 | FILE_ALL_INFO *findData, |
193 | int legacy /* whether to use old info level */, | 193 | int legacy /* whether to use old info level */, |
194 | const struct nls_table *nls_codepage, int remap); | 194 | const struct nls_table *nls_codepage, int remap); |
195 | extern int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon, | 195 | extern int SMBQueryInformation(const int xid, struct cifs_tcon *tcon, |
196 | const unsigned char *searchName, | 196 | const unsigned char *searchName, |
197 | FILE_ALL_INFO *findData, | 197 | FILE_ALL_INFO *findData, |
198 | const struct nls_table *nls_codepage, int remap); | 198 | const struct nls_table *nls_codepage, int remap); |
199 | 199 | ||
200 | extern int CIFSSMBUnixQFileInfo(const int xid, struct cifsTconInfo *tcon, | 200 | extern int CIFSSMBUnixQFileInfo(const int xid, struct cifs_tcon *tcon, |
201 | u16 netfid, FILE_UNIX_BASIC_INFO *pFindData); | 201 | u16 netfid, FILE_UNIX_BASIC_INFO *pFindData); |
202 | extern int CIFSSMBUnixQPathInfo(const int xid, | 202 | extern int CIFSSMBUnixQPathInfo(const int xid, |
203 | struct cifsTconInfo *tcon, | 203 | struct cifs_tcon *tcon, |
204 | const unsigned char *searchName, | 204 | const unsigned char *searchName, |
205 | FILE_UNIX_BASIC_INFO *pFindData, | 205 | FILE_UNIX_BASIC_INFO *pFindData, |
206 | const struct nls_table *nls_codepage, int remap); | 206 | const struct nls_table *nls_codepage, int remap); |
207 | 207 | ||
208 | extern int CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, | 208 | extern int CIFSGetDFSRefer(const int xid, struct cifs_ses *ses, |
209 | const unsigned char *searchName, | 209 | const unsigned char *searchName, |
210 | struct dfs_info3_param **target_nodes, | 210 | struct dfs_info3_param **target_nodes, |
211 | unsigned int *number_of_nodes_in_array, | 211 | unsigned int *number_of_nodes_in_array, |
212 | const struct nls_table *nls_codepage, int remap); | 212 | const struct nls_table *nls_codepage, int remap); |
213 | 213 | ||
214 | extern int get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, | 214 | extern int get_dfs_path(int xid, struct cifs_ses *pSesInfo, |
215 | const char *old_path, | 215 | const char *old_path, |
216 | const struct nls_table *nls_codepage, | 216 | const struct nls_table *nls_codepage, |
217 | unsigned int *pnum_referrals, | 217 | unsigned int *pnum_referrals, |
218 | struct dfs_info3_param **preferrals, | 218 | struct dfs_info3_param **preferrals, |
219 | int remap); | 219 | int remap); |
220 | extern void reset_cifs_unix_caps(int xid, struct cifsTconInfo *tcon, | 220 | extern void reset_cifs_unix_caps(int xid, struct cifs_tcon *tcon, |
221 | struct super_block *sb, struct smb_vol *vol); | 221 | struct super_block *sb, struct smb_vol *vol); |
222 | extern int CIFSSMBQFSInfo(const int xid, struct cifsTconInfo *tcon, | 222 | extern int CIFSSMBQFSInfo(const int xid, struct cifs_tcon *tcon, |
223 | struct kstatfs *FSData); | 223 | struct kstatfs *FSData); |
224 | extern int SMBOldQFSInfo(const int xid, struct cifsTconInfo *tcon, | 224 | extern int SMBOldQFSInfo(const int xid, struct cifs_tcon *tcon, |
225 | struct kstatfs *FSData); | 225 | struct kstatfs *FSData); |
226 | extern int CIFSSMBSetFSUnixInfo(const int xid, struct cifsTconInfo *tcon, | 226 | extern int CIFSSMBSetFSUnixInfo(const int xid, struct cifs_tcon *tcon, |
227 | __u64 cap); | 227 | __u64 cap); |
228 | 228 | ||
229 | extern int CIFSSMBQFSAttributeInfo(const int xid, | 229 | extern int CIFSSMBQFSAttributeInfo(const int xid, |
230 | struct cifsTconInfo *tcon); | 230 | struct cifs_tcon *tcon); |
231 | extern int CIFSSMBQFSDeviceInfo(const int xid, struct cifsTconInfo *tcon); | 231 | extern int CIFSSMBQFSDeviceInfo(const int xid, struct cifs_tcon *tcon); |
232 | extern int CIFSSMBQFSUnixInfo(const int xid, struct cifsTconInfo *tcon); | 232 | extern int CIFSSMBQFSUnixInfo(const int xid, struct cifs_tcon *tcon); |
233 | extern int CIFSSMBQFSPosixInfo(const int xid, struct cifsTconInfo *tcon, | 233 | extern int CIFSSMBQFSPosixInfo(const int xid, struct cifs_tcon *tcon, |
234 | struct kstatfs *FSData); | 234 | struct kstatfs *FSData); |
235 | 235 | ||
236 | extern int CIFSSMBSetPathInfo(const int xid, struct cifsTconInfo *tcon, | 236 | extern int CIFSSMBSetPathInfo(const int xid, struct cifs_tcon *tcon, |
237 | const char *fileName, const FILE_BASIC_INFO *data, | 237 | const char *fileName, const FILE_BASIC_INFO *data, |
238 | const struct nls_table *nls_codepage, | 238 | const struct nls_table *nls_codepage, |
239 | int remap_special_chars); | 239 | int remap_special_chars); |
240 | extern int CIFSSMBSetFileInfo(const int xid, struct cifsTconInfo *tcon, | 240 | extern int CIFSSMBSetFileInfo(const int xid, struct cifs_tcon *tcon, |
241 | const FILE_BASIC_INFO *data, __u16 fid, | 241 | const FILE_BASIC_INFO *data, __u16 fid, |
242 | __u32 pid_of_opener); | 242 | __u32 pid_of_opener); |
243 | extern int CIFSSMBSetFileDisposition(const int xid, struct cifsTconInfo *tcon, | 243 | extern int CIFSSMBSetFileDisposition(const int xid, struct cifs_tcon *tcon, |
244 | bool delete_file, __u16 fid, __u32 pid_of_opener); | 244 | bool delete_file, __u16 fid, __u32 pid_of_opener); |
245 | #if 0 | 245 | #if 0 |
246 | extern int CIFSSMBSetAttrLegacy(int xid, struct cifsTconInfo *tcon, | 246 | extern int CIFSSMBSetAttrLegacy(int xid, struct cifs_tcon *tcon, |
247 | char *fileName, __u16 dos_attributes, | 247 | char *fileName, __u16 dos_attributes, |
248 | const struct nls_table *nls_codepage); | 248 | const struct nls_table *nls_codepage); |
249 | #endif /* possibly unneeded function */ | 249 | #endif /* possibly unneeded function */ |
250 | extern int CIFSSMBSetEOF(const int xid, struct cifsTconInfo *tcon, | 250 | extern int CIFSSMBSetEOF(const int xid, struct cifs_tcon *tcon, |
251 | const char *fileName, __u64 size, | 251 | const char *fileName, __u64 size, |
252 | bool setAllocationSizeFlag, | 252 | bool setAllocationSizeFlag, |
253 | const struct nls_table *nls_codepage, | 253 | const struct nls_table *nls_codepage, |
254 | int remap_special_chars); | 254 | int remap_special_chars); |
255 | extern int CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, | 255 | extern int CIFSSMBSetFileSize(const int xid, struct cifs_tcon *tcon, |
256 | __u64 size, __u16 fileHandle, __u32 opener_pid, | 256 | __u64 size, __u16 fileHandle, __u32 opener_pid, |
257 | bool AllocSizeFlag); | 257 | bool AllocSizeFlag); |
258 | 258 | ||
@@ -266,83 +266,83 @@ struct cifs_unix_set_info_args { | |||
266 | dev_t device; | 266 | dev_t device; |
267 | }; | 267 | }; |
268 | 268 | ||
269 | extern int CIFSSMBUnixSetFileInfo(const int xid, struct cifsTconInfo *tcon, | 269 | extern int CIFSSMBUnixSetFileInfo(const int xid, struct cifs_tcon *tcon, |
270 | const struct cifs_unix_set_info_args *args, | 270 | const struct cifs_unix_set_info_args *args, |
271 | u16 fid, u32 pid_of_opener); | 271 | u16 fid, u32 pid_of_opener); |
272 | 272 | ||
273 | extern int CIFSSMBUnixSetPathInfo(const int xid, struct cifsTconInfo *pTcon, | 273 | extern int CIFSSMBUnixSetPathInfo(const int xid, struct cifs_tcon *pTcon, |
274 | char *fileName, | 274 | char *fileName, |
275 | const struct cifs_unix_set_info_args *args, | 275 | const struct cifs_unix_set_info_args *args, |
276 | const struct nls_table *nls_codepage, | 276 | const struct nls_table *nls_codepage, |
277 | int remap_special_chars); | 277 | int remap_special_chars); |
278 | 278 | ||
279 | extern int CIFSSMBMkDir(const int xid, struct cifsTconInfo *tcon, | 279 | extern int CIFSSMBMkDir(const int xid, struct cifs_tcon *tcon, |
280 | const char *newName, | 280 | const char *newName, |
281 | const struct nls_table *nls_codepage, | 281 | const struct nls_table *nls_codepage, |
282 | int remap_special_chars); | 282 | int remap_special_chars); |
283 | extern int CIFSSMBRmDir(const int xid, struct cifsTconInfo *tcon, | 283 | extern int CIFSSMBRmDir(const int xid, struct cifs_tcon *tcon, |
284 | const char *name, const struct nls_table *nls_codepage, | 284 | const char *name, const struct nls_table *nls_codepage, |
285 | int remap_special_chars); | 285 | int remap_special_chars); |
286 | extern int CIFSPOSIXDelFile(const int xid, struct cifsTconInfo *tcon, | 286 | extern int CIFSPOSIXDelFile(const int xid, struct cifs_tcon *tcon, |
287 | const char *name, __u16 type, | 287 | const char *name, __u16 type, |
288 | const struct nls_table *nls_codepage, | 288 | const struct nls_table *nls_codepage, |
289 | int remap_special_chars); | 289 | int remap_special_chars); |
290 | extern int CIFSSMBDelFile(const int xid, struct cifsTconInfo *tcon, | 290 | extern int CIFSSMBDelFile(const int xid, struct cifs_tcon *tcon, |
291 | const char *name, | 291 | const char *name, |
292 | const struct nls_table *nls_codepage, | 292 | const struct nls_table *nls_codepage, |
293 | int remap_special_chars); | 293 | int remap_special_chars); |
294 | extern int CIFSSMBRename(const int xid, struct cifsTconInfo *tcon, | 294 | extern int CIFSSMBRename(const int xid, struct cifs_tcon *tcon, |
295 | const char *fromName, const char *toName, | 295 | const char *fromName, const char *toName, |
296 | const struct nls_table *nls_codepage, | 296 | const struct nls_table *nls_codepage, |
297 | int remap_special_chars); | 297 | int remap_special_chars); |
298 | extern int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon, | 298 | extern int CIFSSMBRenameOpenFile(const int xid, struct cifs_tcon *pTcon, |
299 | int netfid, const char *target_name, | 299 | int netfid, const char *target_name, |
300 | const struct nls_table *nls_codepage, | 300 | const struct nls_table *nls_codepage, |
301 | int remap_special_chars); | 301 | int remap_special_chars); |
302 | extern int CIFSCreateHardLink(const int xid, | 302 | extern int CIFSCreateHardLink(const int xid, |
303 | struct cifsTconInfo *tcon, | 303 | struct cifs_tcon *tcon, |
304 | const char *fromName, const char *toName, | 304 | const char *fromName, const char *toName, |
305 | const struct nls_table *nls_codepage, | 305 | const struct nls_table *nls_codepage, |
306 | int remap_special_chars); | 306 | int remap_special_chars); |
307 | extern int CIFSUnixCreateHardLink(const int xid, | 307 | extern int CIFSUnixCreateHardLink(const int xid, |
308 | struct cifsTconInfo *tcon, | 308 | struct cifs_tcon *tcon, |
309 | const char *fromName, const char *toName, | 309 | const char *fromName, const char *toName, |
310 | const struct nls_table *nls_codepage, | 310 | const struct nls_table *nls_codepage, |
311 | int remap_special_chars); | 311 | int remap_special_chars); |
312 | extern int CIFSUnixCreateSymLink(const int xid, | 312 | extern int CIFSUnixCreateSymLink(const int xid, |
313 | struct cifsTconInfo *tcon, | 313 | struct cifs_tcon *tcon, |
314 | const char *fromName, const char *toName, | 314 | const char *fromName, const char *toName, |
315 | const struct nls_table *nls_codepage); | 315 | const struct nls_table *nls_codepage); |
316 | extern int CIFSSMBUnixQuerySymLink(const int xid, | 316 | extern int CIFSSMBUnixQuerySymLink(const int xid, |
317 | struct cifsTconInfo *tcon, | 317 | struct cifs_tcon *tcon, |
318 | const unsigned char *searchName, char **syminfo, | 318 | const unsigned char *searchName, char **syminfo, |
319 | const struct nls_table *nls_codepage); | 319 | const struct nls_table *nls_codepage); |
320 | #ifdef CONFIG_CIFS_SYMLINK_EXPERIMENTAL | 320 | #ifdef CONFIG_CIFS_SYMLINK_EXPERIMENTAL |
321 | extern int CIFSSMBQueryReparseLinkInfo(const int xid, | 321 | extern int CIFSSMBQueryReparseLinkInfo(const int xid, |
322 | struct cifsTconInfo *tcon, | 322 | struct cifs_tcon *tcon, |
323 | const unsigned char *searchName, | 323 | const unsigned char *searchName, |
324 | char *symlinkinfo, const int buflen, __u16 fid, | 324 | char *symlinkinfo, const int buflen, __u16 fid, |
325 | const struct nls_table *nls_codepage); | 325 | const struct nls_table *nls_codepage); |
326 | #endif /* temporarily unused until cifs_symlink fixed */ | 326 | #endif /* temporarily unused until cifs_symlink fixed */ |
327 | extern int CIFSSMBOpen(const int xid, struct cifsTconInfo *tcon, | 327 | extern int CIFSSMBOpen(const int xid, struct cifs_tcon *tcon, |
328 | const char *fileName, const int disposition, | 328 | const char *fileName, const int disposition, |
329 | const int access_flags, const int omode, | 329 | const int access_flags, const int omode, |
330 | __u16 *netfid, int *pOplock, FILE_ALL_INFO *, | 330 | __u16 *netfid, int *pOplock, FILE_ALL_INFO *, |
331 | const struct nls_table *nls_codepage, int remap); | 331 | const struct nls_table *nls_codepage, int remap); |
332 | extern int SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon, | 332 | extern int SMBLegacyOpen(const int xid, struct cifs_tcon *tcon, |
333 | const char *fileName, const int disposition, | 333 | const char *fileName, const int disposition, |
334 | const int access_flags, const int omode, | 334 | const int access_flags, const int omode, |
335 | __u16 *netfid, int *pOplock, FILE_ALL_INFO *, | 335 | __u16 *netfid, int *pOplock, FILE_ALL_INFO *, |
336 | const struct nls_table *nls_codepage, int remap); | 336 | const struct nls_table *nls_codepage, int remap); |
337 | extern int CIFSPOSIXCreate(const int xid, struct cifsTconInfo *tcon, | 337 | extern int CIFSPOSIXCreate(const int xid, struct cifs_tcon *tcon, |
338 | u32 posix_flags, __u64 mode, __u16 *netfid, | 338 | u32 posix_flags, __u64 mode, __u16 *netfid, |
339 | FILE_UNIX_BASIC_INFO *pRetData, | 339 | FILE_UNIX_BASIC_INFO *pRetData, |
340 | __u32 *pOplock, const char *name, | 340 | __u32 *pOplock, const char *name, |
341 | const struct nls_table *nls_codepage, int remap); | 341 | const struct nls_table *nls_codepage, int remap); |
342 | extern int CIFSSMBClose(const int xid, struct cifsTconInfo *tcon, | 342 | extern int CIFSSMBClose(const int xid, struct cifs_tcon *tcon, |
343 | const int smb_file_id); | 343 | const int smb_file_id); |
344 | 344 | ||
345 | extern int CIFSSMBFlush(const int xid, struct cifsTconInfo *tcon, | 345 | extern int CIFSSMBFlush(const int xid, struct cifs_tcon *tcon, |
346 | const int smb_file_id); | 346 | const int smb_file_id); |
347 | 347 | ||
348 | extern int CIFSSMBRead(const int xid, struct cifs_io_parms *io_parms, | 348 | extern int CIFSSMBRead(const int xid, struct cifs_io_parms *io_parms, |
@@ -354,28 +354,28 @@ extern int CIFSSMBWrite(const int xid, struct cifs_io_parms *io_parms, | |||
354 | extern int CIFSSMBWrite2(const int xid, struct cifs_io_parms *io_parms, | 354 | extern int CIFSSMBWrite2(const int xid, struct cifs_io_parms *io_parms, |
355 | unsigned int *nbytes, struct kvec *iov, const int nvec, | 355 | unsigned int *nbytes, struct kvec *iov, const int nvec, |
356 | const int long_op); | 356 | const int long_op); |
357 | extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon, | 357 | extern int CIFSGetSrvInodeNumber(const int xid, struct cifs_tcon *tcon, |
358 | const unsigned char *searchName, __u64 *inode_number, | 358 | const unsigned char *searchName, __u64 *inode_number, |
359 | const struct nls_table *nls_codepage, | 359 | const struct nls_table *nls_codepage, |
360 | int remap_special_chars); | 360 | int remap_special_chars); |
361 | 361 | ||
362 | extern int CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, | 362 | extern int CIFSSMBLock(const int xid, struct cifs_tcon *tcon, |
363 | const __u16 netfid, const __u64 len, | 363 | const __u16 netfid, const __u64 len, |
364 | const __u64 offset, const __u32 numUnlock, | 364 | const __u64 offset, const __u32 numUnlock, |
365 | const __u32 numLock, const __u8 lockType, | 365 | const __u32 numLock, const __u8 lockType, |
366 | const bool waitFlag, const __u8 oplock_level); | 366 | const bool waitFlag, const __u8 oplock_level); |
367 | extern int CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon, | 367 | extern int CIFSSMBPosixLock(const int xid, struct cifs_tcon *tcon, |
368 | const __u16 smb_file_id, const int get_flag, | 368 | const __u16 smb_file_id, const int get_flag, |
369 | const __u64 len, struct file_lock *, | 369 | const __u64 len, struct file_lock *, |
370 | const __u16 lock_type, const bool waitFlag); | 370 | const __u16 lock_type, const bool waitFlag); |
371 | extern int CIFSSMBTDis(const int xid, struct cifsTconInfo *tcon); | 371 | extern int CIFSSMBTDis(const int xid, struct cifs_tcon *tcon); |
372 | extern int CIFSSMBEcho(struct TCP_Server_Info *server); | 372 | extern int CIFSSMBEcho(struct TCP_Server_Info *server); |
373 | extern int CIFSSMBLogoff(const int xid, struct cifsSesInfo *ses); | 373 | extern int CIFSSMBLogoff(const int xid, struct cifs_ses *ses); |
374 | 374 | ||
375 | extern struct cifsSesInfo *sesInfoAlloc(void); | 375 | extern struct cifs_ses *sesInfoAlloc(void); |
376 | extern void sesInfoFree(struct cifsSesInfo *); | 376 | extern void sesInfoFree(struct cifs_ses *); |
377 | extern struct cifsTconInfo *tconInfoAlloc(void); | 377 | extern struct cifs_tcon *tconInfoAlloc(void); |
378 | extern void tconInfoFree(struct cifsTconInfo *); | 378 | extern void tconInfoFree(struct cifs_tcon *); |
379 | 379 | ||
380 | extern int cifs_sign_smb(struct smb_hdr *, struct TCP_Server_Info *, __u32 *); | 380 | extern int cifs_sign_smb(struct smb_hdr *, struct TCP_Server_Info *, __u32 *); |
381 | extern int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *, | 381 | extern int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *, |
@@ -384,51 +384,51 @@ extern int cifs_verify_signature(struct smb_hdr *, | |||
384 | struct TCP_Server_Info *server, | 384 | struct TCP_Server_Info *server, |
385 | __u32 expected_sequence_number); | 385 | __u32 expected_sequence_number); |
386 | extern int SMBNTencrypt(unsigned char *, unsigned char *, unsigned char *); | 386 | extern int SMBNTencrypt(unsigned char *, unsigned char *, unsigned char *); |
387 | extern int setup_ntlm_response(struct cifsSesInfo *); | 387 | extern int setup_ntlm_response(struct cifs_ses *); |
388 | extern int setup_ntlmv2_rsp(struct cifsSesInfo *, const struct nls_table *); | 388 | extern int setup_ntlmv2_rsp(struct cifs_ses *, const struct nls_table *); |
389 | extern int cifs_crypto_shash_allocate(struct TCP_Server_Info *); | 389 | extern int cifs_crypto_shash_allocate(struct TCP_Server_Info *); |
390 | extern void cifs_crypto_shash_release(struct TCP_Server_Info *); | 390 | extern void cifs_crypto_shash_release(struct TCP_Server_Info *); |
391 | extern int calc_seckey(struct cifsSesInfo *); | 391 | extern int calc_seckey(struct cifs_ses *); |
392 | 392 | ||
393 | #ifdef CONFIG_CIFS_WEAK_PW_HASH | 393 | #ifdef CONFIG_CIFS_WEAK_PW_HASH |
394 | extern int calc_lanman_hash(const char *password, const char *cryptkey, | 394 | extern int calc_lanman_hash(const char *password, const char *cryptkey, |
395 | bool encrypt, char *lnm_session_key); | 395 | bool encrypt, char *lnm_session_key); |
396 | #endif /* CIFS_WEAK_PW_HASH */ | 396 | #endif /* CIFS_WEAK_PW_HASH */ |
397 | #ifdef CONFIG_CIFS_DNOTIFY_EXPERIMENTAL /* unused temporarily */ | 397 | #ifdef CONFIG_CIFS_DNOTIFY_EXPERIMENTAL /* unused temporarily */ |
398 | extern int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon, | 398 | extern int CIFSSMBNotify(const int xid, struct cifs_tcon *tcon, |
399 | const int notify_subdirs, const __u16 netfid, | 399 | const int notify_subdirs, const __u16 netfid, |
400 | __u32 filter, struct file *file, int multishot, | 400 | __u32 filter, struct file *file, int multishot, |
401 | const struct nls_table *nls_codepage); | 401 | const struct nls_table *nls_codepage); |
402 | #endif /* was needed for dnotify, and will be needed for inotify when VFS fix */ | 402 | #endif /* was needed for dnotify, and will be needed for inotify when VFS fix */ |
403 | extern int CIFSSMBCopy(int xid, | 403 | extern int CIFSSMBCopy(int xid, |
404 | struct cifsTconInfo *source_tcon, | 404 | struct cifs_tcon *source_tcon, |
405 | const char *fromName, | 405 | const char *fromName, |
406 | const __u16 target_tid, | 406 | const __u16 target_tid, |
407 | const char *toName, const int flags, | 407 | const char *toName, const int flags, |
408 | const struct nls_table *nls_codepage, | 408 | const struct nls_table *nls_codepage, |
409 | int remap_special_chars); | 409 | int remap_special_chars); |
410 | extern ssize_t CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon, | 410 | extern ssize_t CIFSSMBQAllEAs(const int xid, struct cifs_tcon *tcon, |
411 | const unsigned char *searchName, | 411 | const unsigned char *searchName, |
412 | const unsigned char *ea_name, char *EAData, | 412 | const unsigned char *ea_name, char *EAData, |
413 | size_t bufsize, const struct nls_table *nls_codepage, | 413 | size_t bufsize, const struct nls_table *nls_codepage, |
414 | int remap_special_chars); | 414 | int remap_special_chars); |
415 | extern int CIFSSMBSetEA(const int xid, struct cifsTconInfo *tcon, | 415 | extern int CIFSSMBSetEA(const int xid, struct cifs_tcon *tcon, |
416 | const char *fileName, const char *ea_name, | 416 | const char *fileName, const char *ea_name, |
417 | const void *ea_value, const __u16 ea_value_len, | 417 | const void *ea_value, const __u16 ea_value_len, |
418 | const struct nls_table *nls_codepage, int remap_special_chars); | 418 | const struct nls_table *nls_codepage, int remap_special_chars); |
419 | extern int CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, | 419 | extern int CIFSSMBGetCIFSACL(const int xid, struct cifs_tcon *tcon, |
420 | __u16 fid, struct cifs_ntsd **acl_inf, __u32 *buflen); | 420 | __u16 fid, struct cifs_ntsd **acl_inf, __u32 *buflen); |
421 | extern int CIFSSMBSetCIFSACL(const int, struct cifsTconInfo *, __u16, | 421 | extern int CIFSSMBSetCIFSACL(const int, struct cifs_tcon *, __u16, |
422 | struct cifs_ntsd *, __u32); | 422 | struct cifs_ntsd *, __u32); |
423 | extern int CIFSSMBGetPosixACL(const int xid, struct cifsTconInfo *tcon, | 423 | extern int CIFSSMBGetPosixACL(const int xid, struct cifs_tcon *tcon, |
424 | const unsigned char *searchName, | 424 | const unsigned char *searchName, |
425 | char *acl_inf, const int buflen, const int acl_type, | 425 | char *acl_inf, const int buflen, const int acl_type, |
426 | const struct nls_table *nls_codepage, int remap_special_chars); | 426 | const struct nls_table *nls_codepage, int remap_special_chars); |
427 | extern int CIFSSMBSetPosixACL(const int xid, struct cifsTconInfo *tcon, | 427 | extern int CIFSSMBSetPosixACL(const int xid, struct cifs_tcon *tcon, |
428 | const unsigned char *fileName, | 428 | const unsigned char *fileName, |
429 | const char *local_acl, const int buflen, const int acl_type, | 429 | const char *local_acl, const int buflen, const int acl_type, |
430 | const struct nls_table *nls_codepage, int remap_special_chars); | 430 | const struct nls_table *nls_codepage, int remap_special_chars); |
431 | extern int CIFSGetExtAttr(const int xid, struct cifsTconInfo *tcon, | 431 | extern int CIFSGetExtAttr(const int xid, struct cifs_tcon *tcon, |
432 | const int netfid, __u64 *pExtAttrBits, __u64 *pMask); | 432 | const int netfid, __u64 *pExtAttrBits, __u64 *pMask); |
433 | extern void cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb); | 433 | extern void cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb); |
434 | extern bool CIFSCouldBeMFSymlink(const struct cifs_fattr *fattr); | 434 | extern bool CIFSCouldBeMFSymlink(const struct cifs_fattr *fattr); |