forked from Minki/linux
[CIFS] whitespace fixes
This changeset brought to you ... by patchcheck.pl Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French
parent
762e5ab77c
commit
d38d8c74c7
@ -5,7 +5,7 @@
|
||||
* Convert a unicode character to upper or lower case using
|
||||
* compressed tables.
|
||||
*
|
||||
* Copyright (c) International Business Machines Corp., 2000,2005555555555555555555555555555555555555555555555555555555
|
||||
* Copyright (c) International Business Machines Corp., 2000,2007
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -142,7 +142,8 @@ UniStrlen(const wchar_t * ucs1)
|
||||
}
|
||||
|
||||
/*
|
||||
* UniStrnlen: Return the length (in 16 bit Unicode chars not bytes) of a string (length limited)
|
||||
* UniStrnlen: Return the length (in 16 bit Unicode chars not bytes) of a
|
||||
* string (length limited)
|
||||
*/
|
||||
static inline size_t
|
||||
UniStrnlen(const wchar_t * ucs1, int maxlen)
|
||||
|
||||
@ -63,9 +63,9 @@ extern const struct inode_operations cifs_symlink_inode_ops;
|
||||
|
||||
/* Functions related to files and directories */
|
||||
extern const struct file_operations cifs_file_ops;
|
||||
extern const struct file_operations cifs_file_direct_ops; /* if directio mount */
|
||||
extern const struct file_operations cifs_file_direct_ops; /* if directio mnt */
|
||||
extern const struct file_operations cifs_file_nobrl_ops;
|
||||
extern const struct file_operations cifs_file_direct_nobrl_ops; /* if directio mount */
|
||||
extern const struct file_operations cifs_file_direct_nobrl_ops; /* no brlocks */
|
||||
extern int cifs_open(struct inode *inode, struct file *file);
|
||||
extern int cifs_close(struct inode *inode, struct file *file);
|
||||
extern int cifs_closedir(struct inode *inode, struct file *file);
|
||||
@ -88,7 +88,8 @@ extern struct dentry_operations cifs_ci_dentry_ops;
|
||||
|
||||
/* Functions related to symlinks */
|
||||
extern void *cifs_follow_link(struct dentry *direntry, struct nameidata *nd);
|
||||
extern void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *);
|
||||
extern void cifs_put_link(struct dentry *direntry,
|
||||
struct nameidata *nd, void *);
|
||||
extern int cifs_readlink(struct dentry *direntry, char __user *buffer,
|
||||
int buflen);
|
||||
extern int cifs_symlink(struct inode *inode, struct dentry *direntry,
|
||||
@ -98,7 +99,7 @@ extern int cifs_setxattr(struct dentry *, const char *, const void *,
|
||||
size_t, int);
|
||||
extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t);
|
||||
extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);
|
||||
extern int cifs_ioctl (struct inode * inode, struct file * filep,
|
||||
extern int cifs_ioctl (struct inode *inode, struct file *filep,
|
||||
unsigned int command, unsigned long arg);
|
||||
#define CIFS_VERSION "1.49"
|
||||
#endif /* _CIFSFS_H */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* fs/cifs/cifsglob.h
|
||||
*
|
||||
* Copyright (C) International Business Machines Corp., 2002,2006
|
||||
* Copyright (C) International Business Machines Corp., 2002,2007
|
||||
* Author(s): Steve French (sfrench@us.ibm.com)
|
||||
* Jeremy Allison (jra@samba.org)
|
||||
*
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
#define MAX_TREE_SIZE 2 + MAX_SERVER_SIZE + 1 + MAX_SHARE_SIZE + 1
|
||||
#define MAX_SERVER_SIZE 15
|
||||
#define MAX_SHARE_SIZE 64 /* used to be 20 - this should still be enough */
|
||||
#define MAX_SHARE_SIZE 64 /* used to be 20, this should still be enough */
|
||||
#define MAX_USERNAME_SIZE 32 /* 32 is to allow for 15 char names + null
|
||||
termination then *2 for unicode versions */
|
||||
#define MAX_PASSWORD_SIZE 16
|
||||
@ -200,8 +200,8 @@ struct cifsSesInfo {
|
||||
char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger for
|
||||
TCP names - will ipv6 and sctp addresses fit? */
|
||||
char userName[MAX_USERNAME_SIZE + 1];
|
||||
char * domainName;
|
||||
char * password;
|
||||
char *domainName;
|
||||
char *password;
|
||||
};
|
||||
/* no more than one of the following three session flags may be set */
|
||||
#define CIFS_SES_NT4 1
|
||||
@ -291,9 +291,9 @@ struct cifs_search_info {
|
||||
__u16 entries_in_buffer;
|
||||
__u16 info_level;
|
||||
__u32 resume_key;
|
||||
char * ntwrk_buf_start;
|
||||
char * srch_entries_start;
|
||||
char * presume_name;
|
||||
char *ntwrk_buf_start;
|
||||
char *srch_entries_start;
|
||||
char *presume_name;
|
||||
unsigned int resume_name_len;
|
||||
unsigned endOfSearch:1;
|
||||
unsigned emptyDir:1;
|
||||
@ -309,15 +309,15 @@ struct cifsFileInfo {
|
||||
__u16 netfid; /* file id from remote */
|
||||
/* BB add lock scope info here if needed */ ;
|
||||
/* lock scope id (0 if none) */
|
||||
struct file * pfile; /* needed for writepage */
|
||||
struct inode * pInode; /* needed for oplock break */
|
||||
struct file *pfile; /* needed for writepage */
|
||||
struct inode *pInode; /* needed for oplock break */
|
||||
struct mutex lock_mutex;
|
||||
struct list_head llist; /* list of byte range locks we have. */
|
||||
unsigned closePend:1; /* file is marked to close */
|
||||
unsigned invalidHandle:1; /* file closed via session abend */
|
||||
atomic_t wrtPending; /* handle in use - defer close */
|
||||
struct semaphore fh_sem; /* prevents reopen race after dead ses*/
|
||||
char * search_resume_name; /* BB removeme BB */
|
||||
char *search_resume_name; /* BB removeme BB */
|
||||
struct cifs_search_info srch_inf;
|
||||
};
|
||||
|
||||
@ -327,7 +327,7 @@ struct cifsFileInfo {
|
||||
|
||||
struct cifsInodeInfo {
|
||||
struct list_head lockList;
|
||||
/* BB add in lists for dirty pages - i.e. write caching info for oplock */
|
||||
/* BB add in lists for dirty pages i.e. write caching info for oplock */
|
||||
struct list_head openFileList;
|
||||
int write_behind_rc;
|
||||
__u32 cifsAttrs; /* e.g. DOS archive bit, sparse, compressed, system */
|
||||
@ -381,9 +381,9 @@ static inline void cifs_stats_bytes_read(struct cifsTconInfo *tcon,
|
||||
}
|
||||
#else
|
||||
|
||||
#define cifs_stats_inc(field) do {} while(0)
|
||||
#define cifs_stats_bytes_written(tcon, bytes) do {} while(0)
|
||||
#define cifs_stats_bytes_read(tcon, bytes) do {} while(0)
|
||||
#define cifs_stats_inc(field) do {} while (0)
|
||||
#define cifs_stats_bytes_written(tcon, bytes) do {} while (0)
|
||||
#define cifs_stats_bytes_read(tcon, bytes) do {} while (0)
|
||||
|
||||
#endif
|
||||
|
||||
@ -410,8 +410,8 @@ struct mid_q_entry {
|
||||
|
||||
struct oplock_q_entry {
|
||||
struct list_head qhead;
|
||||
struct inode * pinode;
|
||||
struct cifsTconInfo * tcon;
|
||||
struct inode *pinode;
|
||||
struct cifsTconInfo *tcon;
|
||||
__u16 netfid;
|
||||
};
|
||||
|
||||
@ -426,7 +426,7 @@ struct dir_notify_req {
|
||||
__u16 netfid;
|
||||
__u32 filter; /* CompletionFilter (for multishot) */
|
||||
int multishot;
|
||||
struct file * pfile;
|
||||
struct file *pfile;
|
||||
};
|
||||
|
||||
#define MID_FREE 0
|
||||
|
||||
@ -64,7 +64,7 @@ extern unsigned int smbCalcSize(struct smb_hdr *ptr);
|
||||
extern unsigned int smbCalcSize_LE(struct smb_hdr *ptr);
|
||||
extern int decode_negTokenInit(unsigned char *security_blob, int length,
|
||||
enum securityEnum *secType);
|
||||
extern int cifs_inet_pton(int, char * source, void *dst);
|
||||
extern int cifs_inet_pton(int, char *source, void *dst);
|
||||
extern int map_smb_to_linux_error(struct smb_hdr *smb);
|
||||
extern void header_assemble(struct smb_hdr *, char /* command */ ,
|
||||
const struct cifsTconInfo *, int /* length of
|
||||
@ -90,7 +90,7 @@ extern int cifs_get_inode_info(struct inode **pinode,
|
||||
struct super_block *sb, int xid);
|
||||
extern int cifs_get_inode_info_unix(struct inode **pinode,
|
||||
const unsigned char *search_path,
|
||||
struct super_block *sb,int xid);
|
||||
struct super_block *sb, int xid);
|
||||
|
||||
extern int cifs_mount(struct super_block *, struct cifs_sb_info *, char *,
|
||||
const char *);
|
||||
@ -99,7 +99,7 @@ void cifs_proc_init(void);
|
||||
void cifs_proc_clean(void);
|
||||
|
||||
extern int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,
|
||||
struct nls_table * nls_info);
|
||||
struct nls_table *nls_info);
|
||||
extern int CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses);
|
||||
|
||||
extern int CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
|
||||
@ -108,11 +108,11 @@ extern int CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
|
||||
|
||||
extern int CIFSFindFirst(const int xid, struct cifsTconInfo *tcon,
|
||||
const char *searchName, const struct nls_table *nls_codepage,
|
||||
__u16 *searchHandle, struct cifs_search_info * psrch_inf,
|
||||
__u16 *searchHandle, struct cifs_search_info *psrch_inf,
|
||||
int map, const char dirsep);
|
||||
|
||||
extern int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
|
||||
__u16 searchHandle, struct cifs_search_info * psrch_inf);
|
||||
__u16 searchHandle, struct cifs_search_info *psrch_inf);
|
||||
|
||||
extern int CIFSFindClose(const int, struct cifsTconInfo *tcon,
|
||||
const __u16 search_handle);
|
||||
@ -123,9 +123,9 @@ extern int CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon,
|
||||
int legacy /* whether to use old info level */,
|
||||
const struct nls_table *nls_codepage, int remap);
|
||||
extern int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon,
|
||||
const unsigned char *searchName,
|
||||
FILE_ALL_INFO * findData,
|
||||
const struct nls_table *nls_codepage, int remap);
|
||||
const unsigned char *searchName,
|
||||
FILE_ALL_INFO *findData,
|
||||
const struct nls_table *nls_codepage, int remap);
|
||||
|
||||
extern int CIFSSMBUnixQPathInfo(const int xid,
|
||||
struct cifsTconInfo *tcon,
|
||||
@ -149,7 +149,7 @@ extern int get_dfs_path(int xid, struct cifsSesInfo *pSesInfo,
|
||||
unsigned char ** preferrals,
|
||||
int remap);
|
||||
extern void reset_cifs_unix_caps(int xid, struct cifsTconInfo *tcon,
|
||||
struct super_block * sb, struct smb_vol * vol);
|
||||
struct super_block *sb, struct smb_vol *vol);
|
||||
extern int CIFSSMBQFSInfo(const int xid, struct cifsTconInfo *tcon,
|
||||
struct kstatfs *FSData);
|
||||
extern int SMBOldQFSInfo(const int xid, struct cifsTconInfo *tcon,
|
||||
@ -181,7 +181,7 @@ extern int CIFSSMBSetEOF(const int xid, struct cifsTconInfo *tcon,
|
||||
const struct nls_table *nls_codepage,
|
||||
int remap_special_chars);
|
||||
extern int CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon,
|
||||
__u64 size, __u16 fileHandle,__u32 opener_pid,
|
||||
__u64 size, __u16 fileHandle, __u32 opener_pid,
|
||||
int AllocSizeFlag);
|
||||
extern int CIFSSMBUnixSetPerms(const int xid, struct cifsTconInfo *pTcon,
|
||||
char *full_path, __u64 mode, __u64 uid,
|
||||
@ -205,8 +205,8 @@ extern int CIFSSMBRename(const int xid, struct cifsTconInfo *tcon,
|
||||
const char *fromName, const char *toName,
|
||||
const struct nls_table *nls_codepage,
|
||||
int remap_special_chars);
|
||||
extern int CIFSSMBRenameOpenFile(const int xid,struct cifsTconInfo *pTcon,
|
||||
int netfid, char * target_name,
|
||||
extern int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon,
|
||||
int netfid, char *target_name,
|
||||
const struct nls_table *nls_codepage,
|
||||
int remap_special_chars);
|
||||
extern int CIFSCreateHardLink(const int xid,
|
||||
@ -253,9 +253,9 @@ extern int CIFSSMBClose(const int xid, struct cifsTconInfo *tcon,
|
||||
const int smb_file_id);
|
||||
|
||||
extern int CIFSSMBRead(const int xid, struct cifsTconInfo *tcon,
|
||||
const int netfid, unsigned int count,
|
||||
const __u64 lseek, unsigned int *nbytes, char **buf,
|
||||
int * return_buf_type);
|
||||
const int netfid, unsigned int count,
|
||||
const __u64 lseek, unsigned int *nbytes, char **buf,
|
||||
int *return_buf_type);
|
||||
extern int CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
|
||||
const int netfid, const unsigned int count,
|
||||
const __u64 lseek, unsigned int *nbytes,
|
||||
@ -270,9 +270,9 @@ extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
|
||||
const struct nls_table *nls_codepage,
|
||||
int remap_special_chars);
|
||||
extern int cifs_convertUCSpath(char *target, const __le16 *source, int maxlen,
|
||||
const struct nls_table * codepage);
|
||||
extern int cifsConvertToUCS(__le16 * target, const char *source, int maxlen,
|
||||
const struct nls_table * cp, int mapChars);
|
||||
const struct nls_table *codepage);
|
||||
extern int cifsConvertToUCS(__le16 *target, const char *source, int maxlen,
|
||||
const struct nls_table *cp, int mapChars);
|
||||
|
||||
extern int CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
|
||||
const __u16 netfid, const __u64 len,
|
||||
@ -291,19 +291,19 @@ extern void sesInfoFree(struct cifsSesInfo *);
|
||||
extern struct cifsTconInfo *tconInfoAlloc(void);
|
||||
extern void tconInfoFree(struct cifsTconInfo *);
|
||||
|
||||
extern int cifs_sign_smb(struct smb_hdr *, struct TCP_Server_Info *,__u32 *);
|
||||
extern int cifs_sign_smb(struct smb_hdr *, struct TCP_Server_Info *, __u32 *);
|
||||
extern int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *,
|
||||
__u32 *);
|
||||
extern int cifs_verify_signature(struct smb_hdr *, const char * mac_key,
|
||||
extern int cifs_verify_signature(struct smb_hdr *, const char *mac_key,
|
||||
__u32 expected_sequence_number);
|
||||
extern int cifs_calculate_mac_key(char * key,const char * rn,const char * pass);
|
||||
extern int cifs_calculate_mac_key(char *key, const char *rn, const char *pass);
|
||||
extern int CalcNTLMv2_partial_mac_key(struct cifsSesInfo *,
|
||||
const struct nls_table *);
|
||||
extern void CalcNTLMv2_response(const struct cifsSesInfo *, char * );
|
||||
extern void setup_ntlmv2_rsp(struct cifsSesInfo *, char *,
|
||||
const struct nls_table *);
|
||||
#ifdef CONFIG_CIFS_WEAK_PW_HASH
|
||||
extern void calc_lanman_hash(struct cifsSesInfo * ses, char * lnm_session_key);
|
||||
extern void calc_lanman_hash(struct cifsSesInfo *ses, char *lnm_session_key);
|
||||
#endif /* CIFS_WEAK_PW_HASH */
|
||||
extern int CIFSSMBCopy(int xid,
|
||||
struct cifsTconInfo *source_tcon,
|
||||
@ -313,32 +313,32 @@ extern int CIFSSMBCopy(int xid,
|
||||
const struct nls_table *nls_codepage,
|
||||
int remap_special_chars);
|
||||
extern int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon,
|
||||
const int notify_subdirs,const __u16 netfid,
|
||||
__u32 filter, struct file * file, int multishot,
|
||||
const int notify_subdirs, const __u16 netfid,
|
||||
__u32 filter, struct file *file, int multishot,
|
||||
const struct nls_table *nls_codepage);
|
||||
extern ssize_t CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon,
|
||||
const unsigned char *searchName, char * EAData,
|
||||
const unsigned char *searchName, char *EAData,
|
||||
size_t bufsize, const struct nls_table *nls_codepage,
|
||||
int remap_special_chars);
|
||||
extern ssize_t CIFSSMBQueryEA(const int xid,struct cifsTconInfo * tcon,
|
||||
const unsigned char * searchName,const unsigned char * ea_name,
|
||||
unsigned char * ea_value, size_t buf_size,
|
||||
extern ssize_t CIFSSMBQueryEA(const int xid, struct cifsTconInfo *tcon,
|
||||
const unsigned char * searchName, const unsigned char *ea_name,
|
||||
unsigned char *ea_value, size_t buf_size,
|
||||
const struct nls_table *nls_codepage, int remap_special_chars);
|
||||
extern int CIFSSMBSetEA(const int xid, struct cifsTconInfo *tcon,
|
||||
const char *fileName, const char * ea_name,
|
||||
const void * ea_value, const __u16 ea_value_len,
|
||||
const char *fileName, const char *ea_name,
|
||||
const void *ea_value, const __u16 ea_value_len,
|
||||
const struct nls_table *nls_codepage, int remap_special_chars);
|
||||
extern int CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon,
|
||||
__u16 fid, char *acl_inf, const int buflen,
|
||||
const int acl_type /* ACCESS vs. DEFAULT */);
|
||||
extern int CIFSSMBGetPosixACL(const int xid, struct cifsTconInfo *tcon,
|
||||
const unsigned char *searchName,
|
||||
char *acl_inf, const int buflen,const int acl_type,
|
||||
char *acl_inf, const int buflen, const int acl_type,
|
||||
const struct nls_table *nls_codepage, int remap_special_chars);
|
||||
extern int CIFSSMBSetPosixACL(const int xid, struct cifsTconInfo *tcon,
|
||||
const unsigned char *fileName,
|
||||
const char *local_acl, const int buflen, const int acl_type,
|
||||
const struct nls_table *nls_codepage, int remap_special_chars);
|
||||
extern int CIFSGetExtAttr(const int xid, struct cifsTconInfo *tcon,
|
||||
const int netfid, __u64 * pExtAttrBits, __u64 *pMask);
|
||||
const int netfid, __u64 * pExtAttrBits, __u64 *pMask);
|
||||
#endif /* _CIFSPROTO_H */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* fs/cifs/ntlmssp.h
|
||||
*
|
||||
* Copyright (c) International Business Machines Corp., 2002,2006
|
||||
* Copyright (c) International Business Machines Corp., 2002,2007
|
||||
* Author(s): Steve French (sfrench@us.ibm.com)
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or modify
|
||||
@ -27,18 +27,18 @@
|
||||
#define UnknownMessage cpu_to_le32(8)
|
||||
|
||||
/* Negotiate Flags */
|
||||
#define NTLMSSP_NEGOTIATE_UNICODE 0x01 // Text strings are in unicode
|
||||
#define NTLMSSP_NEGOTIATE_OEM 0x02 // Text strings are in OEM
|
||||
#define NTLMSSP_REQUEST_TARGET 0x04 // Server return its auth realm
|
||||
#define NTLMSSP_NEGOTIATE_SIGN 0x0010 // Request signature capability
|
||||
#define NTLMSSP_NEGOTIATE_SEAL 0x0020 // Request confidentiality
|
||||
#define NTLMSSP_NEGOTIATE_UNICODE 0x01 /* Text strings are in unicode */
|
||||
#define NTLMSSP_NEGOTIATE_OEM 0x02 /* Text strings are in OEM */
|
||||
#define NTLMSSP_REQUEST_TARGET 0x04 /* Server return its auth realm */
|
||||
#define NTLMSSP_NEGOTIATE_SIGN 0x0010 /* Request signature capability */
|
||||
#define NTLMSSP_NEGOTIATE_SEAL 0x0020 /* Request confidentiality */
|
||||
#define NTLMSSP_NEGOTIATE_DGRAM 0x0040
|
||||
#define NTLMSSP_NEGOTIATE_LM_KEY 0x0080 // Use LM session key for sign/seal
|
||||
#define NTLMSSP_NEGOTIATE_NTLM 0x0200 // NTLM authentication
|
||||
#define NTLMSSP_NEGOTIATE_LM_KEY 0x0080 /* Sign/seal use LM session key */
|
||||
#define NTLMSSP_NEGOTIATE_NTLM 0x0200 /* NTLM authentication */
|
||||
#define NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED 0x1000
|
||||
#define NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED 0x2000
|
||||
#define NTLMSSP_NEGOTIATE_LOCAL_CALL 0x4000 // client/server on same machine
|
||||
#define NTLMSSP_NEGOTIATE_ALWAYS_SIGN 0x8000 // Sign for all security levels
|
||||
#define NTLMSSP_NEGOTIATE_LOCAL_CALL 0x4000 /* client/server on same machine */
|
||||
#define NTLMSSP_NEGOTIATE_ALWAYS_SIGN 0x8000 /* Sign for all security levels */
|
||||
#define NTLMSSP_TARGET_TYPE_DOMAIN 0x10000
|
||||
#define NTLMSSP_TARGET_TYPE_SERVER 0x20000
|
||||
#define NTLMSSP_TARGET_TYPE_SHARE 0x40000
|
||||
|
||||
Loading…
Reference in New Issue
Block a user