diff options
author | Pavel Shilovsky <pshilovsky@samba.org> | 2012-06-20 03:21:16 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2012-07-24 11:25:08 -0400 |
commit | 6d5786a34d98bffb8ad50d8053d1e53231fe0636 (patch) | |
tree | ae49860befc52cb18dfb2b86929878a204289601 /fs/cifs/cifsproto.h | |
parent | 2e6e02ab6ddbd539fd7e092973daf057adbd53dc (diff) |
CIFS: Rename Get/FreeXid and make them work with unsigned int
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/cifsproto.h')
-rw-r--r-- | fs/cifs/cifsproto.h | 171 |
1 files changed, 88 insertions, 83 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 5fbd6b9a64d9..8797e4064662 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
@@ -37,20 +37,20 @@ extern struct smb_hdr *cifs_small_buf_get(void); | |||
37 | extern void cifs_small_buf_release(void *); | 37 | extern void cifs_small_buf_release(void *); |
38 | extern int smb_send(struct TCP_Server_Info *, struct smb_hdr *, | 38 | extern int smb_send(struct TCP_Server_Info *, struct smb_hdr *, |
39 | unsigned int /* length */); | 39 | unsigned int /* length */); |
40 | extern unsigned int _GetXid(void); | 40 | extern unsigned int _get_xid(void); |
41 | extern void _FreeXid(unsigned int); | 41 | extern void _free_xid(unsigned int); |
42 | #define GetXid() \ | 42 | #define get_xid() \ |
43 | ({ \ | 43 | ({ \ |
44 | int __xid = (int)_GetXid(); \ | 44 | unsigned int __xid = _get_xid(); \ |
45 | cFYI(1, "CIFS VFS: in %s as Xid: %d with uid: %d", \ | 45 | cFYI(1, "CIFS VFS: in %s as Xid: %u with uid: %d", \ |
46 | __func__, __xid, current_fsuid()); \ | 46 | __func__, __xid, current_fsuid()); \ |
47 | __xid; \ | 47 | __xid; \ |
48 | }) | 48 | }) |
49 | 49 | ||
50 | #define FreeXid(curr_xid) \ | 50 | #define free_xid(curr_xid) \ |
51 | do { \ | 51 | do { \ |
52 | _FreeXid(curr_xid); \ | 52 | _free_xid(curr_xid); \ |
53 | cFYI(1, "CIFS VFS: leaving %s (xid = %d) rc = %d", \ | 53 | cFYI(1, "CIFS VFS: leaving %s (xid = %u) rc = %d", \ |
54 | __func__, curr_xid, (int)rc); \ | 54 | __func__, curr_xid, (int)rc); \ |
55 | } while (0) | 55 | } while (0) |
56 | extern int init_cifs_idmap(void); | 56 | extern int init_cifs_idmap(void); |
@@ -123,10 +123,10 @@ extern void cifs_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock); | |||
123 | extern struct cifsFileInfo *cifs_new_fileinfo(__u16 fileHandle, | 123 | extern struct cifsFileInfo *cifs_new_fileinfo(__u16 fileHandle, |
124 | struct file *file, struct tcon_link *tlink, | 124 | struct file *file, struct tcon_link *tlink, |
125 | __u32 oplock); | 125 | __u32 oplock); |
126 | extern int cifs_posix_open(char *full_path, struct inode **pinode, | 126 | extern int cifs_posix_open(char *full_path, struct inode **inode, |
127 | struct super_block *sb, | 127 | struct super_block *sb, int mode, |
128 | int mode, unsigned int f_flags, | 128 | unsigned int f_flags, __u32 *oplock, __u16 *netfid, |
129 | __u32 *poplock, __u16 *pnetfid, int xid); | 129 | unsigned int xid); |
130 | void cifs_fill_uniqueid(struct super_block *sb, struct cifs_fattr *fattr); | 130 | void cifs_fill_uniqueid(struct super_block *sb, struct cifs_fattr *fattr); |
131 | extern void cifs_unix_basic_to_fattr(struct cifs_fattr *fattr, | 131 | extern void cifs_unix_basic_to_fattr(struct cifs_fattr *fattr, |
132 | FILE_UNIX_BASIC_INFO *info, | 132 | FILE_UNIX_BASIC_INFO *info, |
@@ -139,11 +139,12 @@ extern int cifs_get_file_info(struct file *filp); | |||
139 | extern int cifs_get_inode_info(struct inode **pinode, | 139 | extern int cifs_get_inode_info(struct inode **pinode, |
140 | const unsigned char *search_path, | 140 | const unsigned char *search_path, |
141 | FILE_ALL_INFO *pfile_info, | 141 | FILE_ALL_INFO *pfile_info, |
142 | struct super_block *sb, int xid, const __u16 *pfid); | 142 | struct super_block *sb, unsigned int xid, |
143 | const __u16 *pfid); | ||
143 | extern int cifs_get_file_info_unix(struct file *filp); | 144 | extern int cifs_get_file_info_unix(struct file *filp); |
144 | extern int cifs_get_inode_info_unix(struct inode **pinode, | 145 | extern int cifs_get_inode_info_unix(struct inode **pinode, |
145 | const unsigned char *search_path, | 146 | const unsigned char *search_path, |
146 | struct super_block *sb, int xid); | 147 | struct super_block *sb, unsigned int xid); |
147 | extern int cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, | 148 | extern int cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, |
148 | struct cifs_fattr *fattr, struct inode *inode, | 149 | struct cifs_fattr *fattr, struct inode *inode, |
149 | const char *path, const __u16 *pfid); | 150 | const char *path, const __u16 *pfid); |
@@ -188,88 +189,90 @@ extern int CIFSTCon(const unsigned int xid, struct cifs_ses *ses, | |||
188 | const char *tree, struct cifs_tcon *tcon, | 189 | const char *tree, struct cifs_tcon *tcon, |
189 | const struct nls_table *); | 190 | const struct nls_table *); |
190 | 191 | ||
191 | extern int CIFSFindFirst(const int xid, struct cifs_tcon *tcon, | 192 | extern int CIFSFindFirst(const unsigned int xid, struct cifs_tcon *tcon, |
192 | const char *searchName, const struct nls_table *nls_codepage, | 193 | const char *searchName, const struct nls_table *nls_codepage, |
193 | __u16 *searchHandle, __u16 search_flags, | 194 | __u16 *searchHandle, __u16 search_flags, |
194 | struct cifs_search_info *psrch_inf, | 195 | struct cifs_search_info *psrch_inf, |
195 | int map, const char dirsep); | 196 | int map, const char dirsep); |
196 | 197 | ||
197 | extern int CIFSFindNext(const int xid, struct cifs_tcon *tcon, | 198 | extern int CIFSFindNext(const unsigned int xid, struct cifs_tcon *tcon, |
198 | __u16 searchHandle, __u16 search_flags, | 199 | __u16 searchHandle, __u16 search_flags, |
199 | struct cifs_search_info *psrch_inf); | 200 | struct cifs_search_info *psrch_inf); |
200 | 201 | ||
201 | extern int CIFSFindClose(const int, struct cifs_tcon *tcon, | 202 | extern int CIFSFindClose(const unsigned int xid, struct cifs_tcon *tcon, |
202 | const __u16 search_handle); | 203 | const __u16 search_handle); |
203 | 204 | ||
204 | extern int CIFSSMBQFileInfo(const int xid, struct cifs_tcon *tcon, | 205 | extern int CIFSSMBQFileInfo(const unsigned int xid, struct cifs_tcon *tcon, |
205 | u16 netfid, FILE_ALL_INFO *pFindData); | 206 | u16 netfid, FILE_ALL_INFO *pFindData); |
206 | extern int CIFSSMBQPathInfo(const int xid, struct cifs_tcon *tcon, | 207 | extern int CIFSSMBQPathInfo(const unsigned int xid, struct cifs_tcon *tcon, |
207 | const unsigned char *searchName, | 208 | const unsigned char *searchName, |
208 | FILE_ALL_INFO *findData, | 209 | FILE_ALL_INFO *findData, |
209 | int legacy /* whether to use old info level */, | 210 | int legacy /* whether to use old info level */, |
210 | const struct nls_table *nls_codepage, int remap); | 211 | const struct nls_table *nls_codepage, int remap); |
211 | extern int SMBQueryInformation(const int xid, struct cifs_tcon *tcon, | 212 | extern int SMBQueryInformation(const unsigned int xid, struct cifs_tcon *tcon, |
212 | const unsigned char *searchName, | 213 | const unsigned char *searchName, |
213 | FILE_ALL_INFO *findData, | 214 | FILE_ALL_INFO *findData, |
214 | const struct nls_table *nls_codepage, int remap); | 215 | const struct nls_table *nls_codepage, int remap); |
215 | 216 | ||
216 | extern int CIFSSMBUnixQFileInfo(const int xid, struct cifs_tcon *tcon, | 217 | extern int CIFSSMBUnixQFileInfo(const unsigned int xid, struct cifs_tcon *tcon, |
217 | u16 netfid, FILE_UNIX_BASIC_INFO *pFindData); | 218 | u16 netfid, FILE_UNIX_BASIC_INFO *pFindData); |
218 | extern int CIFSSMBUnixQPathInfo(const int xid, | 219 | extern int CIFSSMBUnixQPathInfo(const unsigned int xid, |
219 | struct cifs_tcon *tcon, | 220 | struct cifs_tcon *tcon, |
220 | const unsigned char *searchName, | 221 | const unsigned char *searchName, |
221 | FILE_UNIX_BASIC_INFO *pFindData, | 222 | FILE_UNIX_BASIC_INFO *pFindData, |
222 | const struct nls_table *nls_codepage, int remap); | 223 | const struct nls_table *nls_codepage, int remap); |
223 | 224 | ||
224 | extern int CIFSGetDFSRefer(const int xid, struct cifs_ses *ses, | 225 | extern int CIFSGetDFSRefer(const unsigned int xid, struct cifs_ses *ses, |
225 | const unsigned char *searchName, | 226 | const unsigned char *searchName, |
226 | struct dfs_info3_param **target_nodes, | 227 | struct dfs_info3_param **target_nodes, |
227 | unsigned int *number_of_nodes_in_array, | 228 | unsigned int *number_of_nodes_in_array, |
228 | const struct nls_table *nls_codepage, int remap); | 229 | const struct nls_table *nls_codepage, int remap); |
229 | 230 | ||
230 | extern int get_dfs_path(int xid, struct cifs_ses *pSesInfo, | 231 | extern int get_dfs_path(unsigned int xid, struct cifs_ses *pSesInfo, |
231 | const char *old_path, | 232 | const char *old_path, |
232 | const struct nls_table *nls_codepage, | 233 | const struct nls_table *nls_codepage, |
233 | unsigned int *pnum_referrals, | 234 | unsigned int *pnum_referrals, |
234 | struct dfs_info3_param **preferrals, | 235 | struct dfs_info3_param **preferrals, |
235 | int remap); | 236 | int remap); |
236 | extern void reset_cifs_unix_caps(int xid, struct cifs_tcon *tcon, | 237 | extern void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon, |
237 | struct cifs_sb_info *cifs_sb, | 238 | struct cifs_sb_info *cifs_sb, |
238 | struct smb_vol *vol); | 239 | struct smb_vol *vol); |
239 | extern int CIFSSMBQFSInfo(const int xid, struct cifs_tcon *tcon, | 240 | extern int CIFSSMBQFSInfo(const unsigned int xid, struct cifs_tcon *tcon, |
240 | struct kstatfs *FSData); | 241 | struct kstatfs *FSData); |
241 | extern int SMBOldQFSInfo(const int xid, struct cifs_tcon *tcon, | 242 | extern int SMBOldQFSInfo(const unsigned int xid, struct cifs_tcon *tcon, |
242 | struct kstatfs *FSData); | 243 | struct kstatfs *FSData); |
243 | extern int CIFSSMBSetFSUnixInfo(const int xid, struct cifs_tcon *tcon, | 244 | extern int CIFSSMBSetFSUnixInfo(const unsigned int xid, struct cifs_tcon *tcon, |
244 | __u64 cap); | 245 | __u64 cap); |
245 | 246 | ||
246 | extern int CIFSSMBQFSAttributeInfo(const int xid, | 247 | extern int CIFSSMBQFSAttributeInfo(const unsigned int xid, |
247 | struct cifs_tcon *tcon); | 248 | struct cifs_tcon *tcon); |
248 | extern int CIFSSMBQFSDeviceInfo(const int xid, struct cifs_tcon *tcon); | 249 | extern int CIFSSMBQFSDeviceInfo(const unsigned int xid, struct cifs_tcon *tcon); |
249 | extern int CIFSSMBQFSUnixInfo(const int xid, struct cifs_tcon *tcon); | 250 | extern int CIFSSMBQFSUnixInfo(const unsigned int xid, struct cifs_tcon *tcon); |
250 | extern int CIFSSMBQFSPosixInfo(const int xid, struct cifs_tcon *tcon, | 251 | extern int CIFSSMBQFSPosixInfo(const unsigned int xid, struct cifs_tcon *tcon, |
251 | struct kstatfs *FSData); | 252 | struct kstatfs *FSData); |
252 | 253 | ||
253 | extern int CIFSSMBSetPathInfo(const int xid, struct cifs_tcon *tcon, | 254 | extern int CIFSSMBSetPathInfo(const unsigned int xid, struct cifs_tcon *tcon, |
254 | const char *fileName, const FILE_BASIC_INFO *data, | 255 | const char *fileName, const FILE_BASIC_INFO *data, |
255 | const struct nls_table *nls_codepage, | 256 | const struct nls_table *nls_codepage, |
256 | int remap_special_chars); | 257 | int remap_special_chars); |
257 | extern int CIFSSMBSetFileInfo(const int xid, struct cifs_tcon *tcon, | 258 | extern int CIFSSMBSetFileInfo(const unsigned int xid, struct cifs_tcon *tcon, |
258 | const FILE_BASIC_INFO *data, __u16 fid, | 259 | const FILE_BASIC_INFO *data, __u16 fid, |
259 | __u32 pid_of_opener); | 260 | __u32 pid_of_opener); |
260 | extern int CIFSSMBSetFileDisposition(const int xid, struct cifs_tcon *tcon, | 261 | extern int CIFSSMBSetFileDisposition(const unsigned int xid, |
261 | bool delete_file, __u16 fid, __u32 pid_of_opener); | 262 | struct cifs_tcon *tcon, |
263 | bool delete_file, __u16 fid, | ||
264 | __u32 pid_of_opener); | ||
262 | #if 0 | 265 | #if 0 |
263 | extern int CIFSSMBSetAttrLegacy(int xid, struct cifs_tcon *tcon, | 266 | extern int CIFSSMBSetAttrLegacy(unsigned int xid, struct cifs_tcon *tcon, |
264 | char *fileName, __u16 dos_attributes, | 267 | char *fileName, __u16 dos_attributes, |
265 | const struct nls_table *nls_codepage); | 268 | const struct nls_table *nls_codepage); |
266 | #endif /* possibly unneeded function */ | 269 | #endif /* possibly unneeded function */ |
267 | extern int CIFSSMBSetEOF(const int xid, struct cifs_tcon *tcon, | 270 | extern int CIFSSMBSetEOF(const unsigned int xid, struct cifs_tcon *tcon, |
268 | const char *fileName, __u64 size, | 271 | const char *fileName, __u64 size, |
269 | bool setAllocationSizeFlag, | 272 | bool setAllocationSizeFlag, |
270 | const struct nls_table *nls_codepage, | 273 | const struct nls_table *nls_codepage, |
271 | int remap_special_chars); | 274 | int remap_special_chars); |
272 | extern int CIFSSMBSetFileSize(const int xid, struct cifs_tcon *tcon, | 275 | extern int CIFSSMBSetFileSize(const unsigned int xid, struct cifs_tcon *tcon, |
273 | __u64 size, __u16 fileHandle, __u32 opener_pid, | 276 | __u64 size, __u16 fileHandle, __u32 opener_pid, |
274 | bool AllocSizeFlag); | 277 | bool AllocSizeFlag); |
275 | 278 | ||
@@ -283,108 +286,110 @@ struct cifs_unix_set_info_args { | |||
283 | dev_t device; | 286 | dev_t device; |
284 | }; | 287 | }; |
285 | 288 | ||
286 | extern int CIFSSMBUnixSetFileInfo(const int xid, struct cifs_tcon *tcon, | 289 | extern int CIFSSMBUnixSetFileInfo(const unsigned int xid, |
290 | struct cifs_tcon *tcon, | ||
287 | const struct cifs_unix_set_info_args *args, | 291 | const struct cifs_unix_set_info_args *args, |
288 | u16 fid, u32 pid_of_opener); | 292 | u16 fid, u32 pid_of_opener); |
289 | 293 | ||
290 | extern int CIFSSMBUnixSetPathInfo(const int xid, struct cifs_tcon *pTcon, | 294 | extern int CIFSSMBUnixSetPathInfo(const unsigned int xid, |
291 | char *fileName, | 295 | struct cifs_tcon *tcon, char *file_name, |
292 | const struct cifs_unix_set_info_args *args, | 296 | const struct cifs_unix_set_info_args *args, |
293 | const struct nls_table *nls_codepage, | 297 | const struct nls_table *nls_codepage, |
294 | int remap_special_chars); | 298 | int remap_special_chars); |
295 | 299 | ||
296 | extern int CIFSSMBMkDir(const int xid, struct cifs_tcon *tcon, | 300 | extern int CIFSSMBMkDir(const unsigned int xid, struct cifs_tcon *tcon, |
297 | const char *newName, | 301 | const char *newName, |
298 | const struct nls_table *nls_codepage, | 302 | const struct nls_table *nls_codepage, |
299 | int remap_special_chars); | 303 | int remap_special_chars); |
300 | extern int CIFSSMBRmDir(const int xid, struct cifs_tcon *tcon, | 304 | extern int CIFSSMBRmDir(const unsigned int xid, struct cifs_tcon *tcon, |
301 | const char *name, const struct nls_table *nls_codepage, | 305 | const char *name, const struct nls_table *nls_codepage, |
302 | int remap_special_chars); | 306 | int remap_special_chars); |
303 | extern int CIFSPOSIXDelFile(const int xid, struct cifs_tcon *tcon, | 307 | extern int CIFSPOSIXDelFile(const unsigned int xid, struct cifs_tcon *tcon, |
304 | const char *name, __u16 type, | 308 | const char *name, __u16 type, |
305 | const struct nls_table *nls_codepage, | 309 | const struct nls_table *nls_codepage, |
306 | int remap_special_chars); | 310 | int remap_special_chars); |
307 | extern int CIFSSMBDelFile(const int xid, struct cifs_tcon *tcon, | 311 | extern int CIFSSMBDelFile(const unsigned int xid, struct cifs_tcon *tcon, |
308 | const char *name, | 312 | const char *name, |
309 | const struct nls_table *nls_codepage, | 313 | const struct nls_table *nls_codepage, |
310 | int remap_special_chars); | 314 | int remap_special_chars); |
311 | extern int CIFSSMBRename(const int xid, struct cifs_tcon *tcon, | 315 | extern int CIFSSMBRename(const unsigned int xid, struct cifs_tcon *tcon, |
312 | const char *fromName, const char *toName, | 316 | const char *fromName, const char *toName, |
313 | const struct nls_table *nls_codepage, | 317 | const struct nls_table *nls_codepage, |
314 | int remap_special_chars); | 318 | int remap_special_chars); |
315 | extern int CIFSSMBRenameOpenFile(const int xid, struct cifs_tcon *pTcon, | 319 | extern int CIFSSMBRenameOpenFile(const unsigned int xid, struct cifs_tcon *tcon, |
316 | int netfid, const char *target_name, | 320 | int netfid, const char *target_name, |
317 | const struct nls_table *nls_codepage, | 321 | const struct nls_table *nls_codepage, |
318 | int remap_special_chars); | 322 | int remap_special_chars); |
319 | extern int CIFSCreateHardLink(const int xid, | 323 | extern int CIFSCreateHardLink(const unsigned int xid, |
320 | struct cifs_tcon *tcon, | 324 | struct cifs_tcon *tcon, |
321 | const char *fromName, const char *toName, | 325 | const char *fromName, const char *toName, |
322 | const struct nls_table *nls_codepage, | 326 | const struct nls_table *nls_codepage, |
323 | int remap_special_chars); | 327 | int remap_special_chars); |
324 | extern int CIFSUnixCreateHardLink(const int xid, | 328 | extern int CIFSUnixCreateHardLink(const unsigned int xid, |
325 | struct cifs_tcon *tcon, | 329 | struct cifs_tcon *tcon, |
326 | const char *fromName, const char *toName, | 330 | const char *fromName, const char *toName, |
327 | const struct nls_table *nls_codepage, | 331 | const struct nls_table *nls_codepage, |
328 | int remap_special_chars); | 332 | int remap_special_chars); |
329 | extern int CIFSUnixCreateSymLink(const int xid, | 333 | extern int CIFSUnixCreateSymLink(const unsigned int xid, |
330 | struct cifs_tcon *tcon, | 334 | struct cifs_tcon *tcon, |
331 | const char *fromName, const char *toName, | 335 | const char *fromName, const char *toName, |
332 | const struct nls_table *nls_codepage); | 336 | const struct nls_table *nls_codepage); |
333 | extern int CIFSSMBUnixQuerySymLink(const int xid, | 337 | extern int CIFSSMBUnixQuerySymLink(const unsigned int xid, |
334 | struct cifs_tcon *tcon, | 338 | struct cifs_tcon *tcon, |
335 | const unsigned char *searchName, char **syminfo, | 339 | const unsigned char *searchName, char **syminfo, |
336 | const struct nls_table *nls_codepage); | 340 | const struct nls_table *nls_codepage); |
337 | #ifdef CONFIG_CIFS_SYMLINK_EXPERIMENTAL | 341 | #ifdef CONFIG_CIFS_SYMLINK_EXPERIMENTAL |
338 | extern int CIFSSMBQueryReparseLinkInfo(const int xid, | 342 | extern int CIFSSMBQueryReparseLinkInfo(const unsigned int xid, |
339 | struct cifs_tcon *tcon, | 343 | struct cifs_tcon *tcon, |
340 | const unsigned char *searchName, | 344 | const unsigned char *searchName, |
341 | char *symlinkinfo, const int buflen, __u16 fid, | 345 | char *symlinkinfo, const int buflen, __u16 fid, |
342 | const struct nls_table *nls_codepage); | 346 | const struct nls_table *nls_codepage); |
343 | #endif /* temporarily unused until cifs_symlink fixed */ | 347 | #endif /* temporarily unused until cifs_symlink fixed */ |
344 | extern int CIFSSMBOpen(const int xid, struct cifs_tcon *tcon, | 348 | extern int CIFSSMBOpen(const unsigned int xid, struct cifs_tcon *tcon, |
345 | const char *fileName, const int disposition, | 349 | const char *fileName, const int disposition, |
346 | const int access_flags, const int omode, | 350 | const int access_flags, const int omode, |
347 | __u16 *netfid, int *pOplock, FILE_ALL_INFO *, | 351 | __u16 *netfid, int *pOplock, FILE_ALL_INFO *, |
348 | const struct nls_table *nls_codepage, int remap); | 352 | const struct nls_table *nls_codepage, int remap); |
349 | extern int SMBLegacyOpen(const int xid, struct cifs_tcon *tcon, | 353 | extern int SMBLegacyOpen(const unsigned int xid, struct cifs_tcon *tcon, |
350 | const char *fileName, const int disposition, | 354 | const char *fileName, const int disposition, |
351 | const int access_flags, const int omode, | 355 | const int access_flags, const int omode, |
352 | __u16 *netfid, int *pOplock, FILE_ALL_INFO *, | 356 | __u16 *netfid, int *pOplock, FILE_ALL_INFO *, |
353 | const struct nls_table *nls_codepage, int remap); | 357 | const struct nls_table *nls_codepage, int remap); |
354 | extern int CIFSPOSIXCreate(const int xid, struct cifs_tcon *tcon, | 358 | extern int CIFSPOSIXCreate(const unsigned int xid, struct cifs_tcon *tcon, |
355 | u32 posix_flags, __u64 mode, __u16 *netfid, | 359 | u32 posix_flags, __u64 mode, __u16 *netfid, |
356 | FILE_UNIX_BASIC_INFO *pRetData, | 360 | FILE_UNIX_BASIC_INFO *pRetData, |
357 | __u32 *pOplock, const char *name, | 361 | __u32 *pOplock, const char *name, |
358 | const struct nls_table *nls_codepage, int remap); | 362 | const struct nls_table *nls_codepage, int remap); |
359 | extern int CIFSSMBClose(const int xid, struct cifs_tcon *tcon, | 363 | extern int CIFSSMBClose(const unsigned int xid, struct cifs_tcon *tcon, |
360 | const int smb_file_id); | 364 | const int smb_file_id); |
361 | 365 | ||
362 | extern int CIFSSMBFlush(const int xid, struct cifs_tcon *tcon, | 366 | extern int CIFSSMBFlush(const unsigned int xid, struct cifs_tcon *tcon, |
363 | const int smb_file_id); | 367 | const int smb_file_id); |
364 | 368 | ||
365 | extern int CIFSSMBRead(const int xid, struct cifs_io_parms *io_parms, | 369 | extern int CIFSSMBRead(const unsigned int xid, struct cifs_io_parms *io_parms, |
366 | unsigned int *nbytes, char **buf, | 370 | unsigned int *nbytes, char **buf, |
367 | int *return_buf_type); | 371 | int *return_buf_type); |
368 | extern int CIFSSMBWrite(const int xid, struct cifs_io_parms *io_parms, | 372 | extern int CIFSSMBWrite(const unsigned int xid, struct cifs_io_parms *io_parms, |
369 | unsigned int *nbytes, const char *buf, | 373 | unsigned int *nbytes, const char *buf, |
370 | const char __user *ubuf, const int long_op); | 374 | const char __user *ubuf, const int long_op); |
371 | extern int CIFSSMBWrite2(const int xid, struct cifs_io_parms *io_parms, | 375 | extern int CIFSSMBWrite2(const unsigned int xid, struct cifs_io_parms *io_parms, |
372 | unsigned int *nbytes, struct kvec *iov, const int nvec, | 376 | unsigned int *nbytes, struct kvec *iov, const int nvec, |
373 | const int long_op); | 377 | const int long_op); |
374 | extern int CIFSGetSrvInodeNumber(const int xid, struct cifs_tcon *tcon, | 378 | extern int CIFSGetSrvInodeNumber(const unsigned int xid, struct cifs_tcon *tcon, |
375 | const unsigned char *searchName, __u64 *inode_number, | 379 | const unsigned char *searchName, __u64 *inode_number, |
376 | const struct nls_table *nls_codepage, | 380 | const struct nls_table *nls_codepage, |
377 | int remap_special_chars); | 381 | int remap_special_chars); |
378 | 382 | ||
379 | extern int cifs_lockv(const int xid, struct cifs_tcon *tcon, const __u16 netfid, | 383 | extern int cifs_lockv(const unsigned int xid, struct cifs_tcon *tcon, |
380 | const __u8 lock_type, const __u32 num_unlock, | 384 | const __u16 netfid, const __u8 lock_type, |
381 | const __u32 num_lock, LOCKING_ANDX_RANGE *buf); | 385 | const __u32 num_unlock, const __u32 num_lock, |
382 | extern int CIFSSMBLock(const int xid, struct cifs_tcon *tcon, | 386 | LOCKING_ANDX_RANGE *buf); |
387 | extern int CIFSSMBLock(const unsigned int xid, struct cifs_tcon *tcon, | ||
383 | const __u16 netfid, const __u32 netpid, const __u64 len, | 388 | const __u16 netfid, const __u32 netpid, const __u64 len, |
384 | const __u64 offset, const __u32 numUnlock, | 389 | const __u64 offset, const __u32 numUnlock, |
385 | const __u32 numLock, const __u8 lockType, | 390 | const __u32 numLock, const __u8 lockType, |
386 | const bool waitFlag, const __u8 oplock_level); | 391 | const bool waitFlag, const __u8 oplock_level); |
387 | extern int CIFSSMBPosixLock(const int xid, struct cifs_tcon *tcon, | 392 | extern int CIFSSMBPosixLock(const unsigned int xid, struct cifs_tcon *tcon, |
388 | const __u16 smb_file_id, const __u32 netpid, | 393 | const __u16 smb_file_id, const __u32 netpid, |
389 | const loff_t start_offset, const __u64 len, | 394 | const loff_t start_offset, const __u64 len, |
390 | struct file_lock *, const __u16 lock_type, | 395 | struct file_lock *, const __u16 lock_type, |
@@ -417,46 +422,46 @@ extern int calc_lanman_hash(const char *password, const char *cryptkey, | |||
417 | bool encrypt, char *lnm_session_key); | 422 | bool encrypt, char *lnm_session_key); |
418 | #endif /* CIFS_WEAK_PW_HASH */ | 423 | #endif /* CIFS_WEAK_PW_HASH */ |
419 | #ifdef CONFIG_CIFS_DNOTIFY_EXPERIMENTAL /* unused temporarily */ | 424 | #ifdef CONFIG_CIFS_DNOTIFY_EXPERIMENTAL /* unused temporarily */ |
420 | extern int CIFSSMBNotify(const int xid, struct cifs_tcon *tcon, | 425 | extern int CIFSSMBNotify(const unsigned int xid, struct cifs_tcon *tcon, |
421 | const int notify_subdirs, const __u16 netfid, | 426 | const int notify_subdirs, const __u16 netfid, |
422 | __u32 filter, struct file *file, int multishot, | 427 | __u32 filter, struct file *file, int multishot, |
423 | const struct nls_table *nls_codepage); | 428 | const struct nls_table *nls_codepage); |
424 | #endif /* was needed for dnotify, and will be needed for inotify when VFS fix */ | 429 | #endif /* was needed for dnotify, and will be needed for inotify when VFS fix */ |
425 | extern int CIFSSMBCopy(int xid, | 430 | extern int CIFSSMBCopy(unsigned int xid, |
426 | struct cifs_tcon *source_tcon, | 431 | struct cifs_tcon *source_tcon, |
427 | const char *fromName, | 432 | const char *fromName, |
428 | const __u16 target_tid, | 433 | const __u16 target_tid, |
429 | const char *toName, const int flags, | 434 | const char *toName, const int flags, |
430 | const struct nls_table *nls_codepage, | 435 | const struct nls_table *nls_codepage, |
431 | int remap_special_chars); | 436 | int remap_special_chars); |
432 | extern ssize_t CIFSSMBQAllEAs(const int xid, struct cifs_tcon *tcon, | 437 | extern ssize_t CIFSSMBQAllEAs(const unsigned int xid, struct cifs_tcon *tcon, |
433 | const unsigned char *searchName, | 438 | const unsigned char *searchName, |
434 | const unsigned char *ea_name, char *EAData, | 439 | const unsigned char *ea_name, char *EAData, |
435 | size_t bufsize, const struct nls_table *nls_codepage, | 440 | size_t bufsize, const struct nls_table *nls_codepage, |
436 | int remap_special_chars); | 441 | int remap_special_chars); |
437 | extern int CIFSSMBSetEA(const int xid, struct cifs_tcon *tcon, | 442 | extern int CIFSSMBSetEA(const unsigned int xid, struct cifs_tcon *tcon, |
438 | const char *fileName, const char *ea_name, | 443 | const char *fileName, const char *ea_name, |
439 | const void *ea_value, const __u16 ea_value_len, | 444 | const void *ea_value, const __u16 ea_value_len, |
440 | const struct nls_table *nls_codepage, int remap_special_chars); | 445 | const struct nls_table *nls_codepage, int remap_special_chars); |
441 | extern int CIFSSMBGetCIFSACL(const int xid, struct cifs_tcon *tcon, | 446 | extern int CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, |
442 | __u16 fid, struct cifs_ntsd **acl_inf, __u32 *buflen); | 447 | __u16 fid, struct cifs_ntsd **acl_inf, __u32 *buflen); |
443 | extern int CIFSSMBSetCIFSACL(const int, struct cifs_tcon *, __u16, | 448 | extern int CIFSSMBSetCIFSACL(const unsigned int, struct cifs_tcon *, __u16, |
444 | struct cifs_ntsd *, __u32, int); | 449 | struct cifs_ntsd *, __u32, int); |
445 | extern int CIFSSMBGetPosixACL(const int xid, struct cifs_tcon *tcon, | 450 | extern int CIFSSMBGetPosixACL(const unsigned int xid, struct cifs_tcon *tcon, |
446 | const unsigned char *searchName, | 451 | const unsigned char *searchName, |
447 | char *acl_inf, const int buflen, const int acl_type, | 452 | char *acl_inf, const int buflen, const int acl_type, |
448 | const struct nls_table *nls_codepage, int remap_special_chars); | 453 | const struct nls_table *nls_codepage, int remap_special_chars); |
449 | extern int CIFSSMBSetPosixACL(const int xid, struct cifs_tcon *tcon, | 454 | extern int CIFSSMBSetPosixACL(const unsigned int xid, struct cifs_tcon *tcon, |
450 | const unsigned char *fileName, | 455 | const unsigned char *fileName, |
451 | const char *local_acl, const int buflen, const int acl_type, | 456 | const char *local_acl, const int buflen, const int acl_type, |
452 | const struct nls_table *nls_codepage, int remap_special_chars); | 457 | const struct nls_table *nls_codepage, int remap_special_chars); |
453 | extern int CIFSGetExtAttr(const int xid, struct cifs_tcon *tcon, | 458 | extern int CIFSGetExtAttr(const unsigned int xid, struct cifs_tcon *tcon, |
454 | const int netfid, __u64 *pExtAttrBits, __u64 *pMask); | 459 | const int netfid, __u64 *pExtAttrBits, __u64 *pMask); |
455 | extern void cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb); | 460 | extern void cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb); |
456 | extern bool CIFSCouldBeMFSymlink(const struct cifs_fattr *fattr); | 461 | extern bool CIFSCouldBeMFSymlink(const struct cifs_fattr *fattr); |
457 | extern int CIFSCheckMFSymlink(struct cifs_fattr *fattr, | 462 | extern int CIFSCheckMFSymlink(struct cifs_fattr *fattr, |
458 | const unsigned char *path, | 463 | const unsigned char *path, |
459 | struct cifs_sb_info *cifs_sb, int xid); | 464 | struct cifs_sb_info *cifs_sb, unsigned int xid); |
460 | extern int mdfour(unsigned char *, unsigned char *, int); | 465 | extern int mdfour(unsigned char *, unsigned char *, int); |
461 | extern int E_md4hash(const unsigned char *passwd, unsigned char *p16, | 466 | extern int E_md4hash(const unsigned char *passwd, unsigned char *p16, |
462 | const struct nls_table *codepage); | 467 | const struct nls_table *codepage); |