[CIFS] minor checkpatch cleanup
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
parent
d6c2e4d02b
commit
8840dee9dc
@ -248,15 +248,15 @@ extern int CIFSSMBQueryReparseLinkInfo(const int xid,
|
|||||||
extern int CIFSSMBOpen(const int xid, struct cifsTconInfo *tcon,
|
extern int CIFSSMBOpen(const int xid, struct cifsTconInfo *tcon,
|
||||||
const char *fileName, const int disposition,
|
const char *fileName, const int disposition,
|
||||||
const int access_flags, const int omode,
|
const int access_flags, const int omode,
|
||||||
__u16 * netfid, int *pOplock, FILE_ALL_INFO *,
|
__u16 *netfid, int *pOplock, FILE_ALL_INFO *,
|
||||||
const struct nls_table *nls_codepage, int remap);
|
const struct nls_table *nls_codepage, int remap);
|
||||||
extern int SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon,
|
extern int SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon,
|
||||||
const char *fileName, const int disposition,
|
const char *fileName, const int disposition,
|
||||||
const int access_flags, const int omode,
|
const int access_flags, const int omode,
|
||||||
__u16 * netfid, int *pOplock, FILE_ALL_INFO *,
|
__u16 *netfid, int *pOplock, FILE_ALL_INFO *,
|
||||||
const struct nls_table *nls_codepage, int remap);
|
const struct nls_table *nls_codepage, int remap);
|
||||||
extern int CIFSPOSIXCreate(const int xid, struct cifsTconInfo *tcon,
|
extern int CIFSPOSIXCreate(const int xid, struct cifsTconInfo *tcon,
|
||||||
u32 posix_flags, __u64 mode, __u16 * netfid,
|
u32 posix_flags, __u64 mode, __u16 *netfid,
|
||||||
FILE_UNIX_BASIC_INFO *pRetData,
|
FILE_UNIX_BASIC_INFO *pRetData,
|
||||||
__u32 *pOplock, const char *name,
|
__u32 *pOplock, const char *name,
|
||||||
const struct nls_table *nls_codepage, int remap);
|
const struct nls_table *nls_codepage, int remap);
|
||||||
@ -277,7 +277,7 @@ extern int CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
|
|||||||
const __u64 offset, unsigned int *nbytes,
|
const __u64 offset, unsigned int *nbytes,
|
||||||
struct kvec *iov, const int nvec, const int long_op);
|
struct kvec *iov, const int nvec, const int long_op);
|
||||||
extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
|
extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
|
||||||
const unsigned char *searchName, __u64 * inode_number,
|
const unsigned char *searchName, __u64 *inode_number,
|
||||||
const struct nls_table *nls_codepage,
|
const struct nls_table *nls_codepage,
|
||||||
int remap_special_chars);
|
int remap_special_chars);
|
||||||
extern int cifs_convertUCSpath(char *target, const __le16 *source, int maxlen,
|
extern int cifs_convertUCSpath(char *target, const __le16 *source, int maxlen,
|
||||||
@ -352,5 +352,5 @@ extern int CIFSSMBSetPosixACL(const int xid, struct cifsTconInfo *tcon,
|
|||||||
const char *local_acl, const int buflen, const int acl_type,
|
const char *local_acl, const int buflen, const int acl_type,
|
||||||
const struct nls_table *nls_codepage, int remap_special_chars);
|
const struct nls_table *nls_codepage, int remap_special_chars);
|
||||||
extern int CIFSGetExtAttr(const int xid, struct cifsTconInfo *tcon,
|
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 */
|
#endif /* _CIFSPROTO_H */
|
||||||
|
@ -1944,7 +1944,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
|
|||||||
srvTcp->tcpStatus = CifsNew;
|
srvTcp->tcpStatus = CifsNew;
|
||||||
init_MUTEX(&srvTcp->tcpSem);
|
init_MUTEX(&srvTcp->tcpSem);
|
||||||
srvTcp->tsk = kthread_run((void *)(void *)cifs_demultiplex_thread, srvTcp, "cifsd");
|
srvTcp->tsk = kthread_run((void *)(void *)cifs_demultiplex_thread, srvTcp, "cifsd");
|
||||||
if ( IS_ERR(srvTcp->tsk) ) {
|
if (IS_ERR(srvTcp->tsk)) {
|
||||||
rc = PTR_ERR(srvTcp->tsk);
|
rc = PTR_ERR(srvTcp->tsk);
|
||||||
cERROR(1, ("error %d create cifsd thread", rc));
|
cERROR(1, ("error %d create cifsd thread", rc));
|
||||||
srvTcp->tsk = NULL;
|
srvTcp->tsk = NULL;
|
||||||
|
@ -1087,11 +1087,11 @@ refind_writable:
|
|||||||
read_unlock(&GlobalSMBSeslock);
|
read_unlock(&GlobalSMBSeslock);
|
||||||
return open_file;
|
return open_file;
|
||||||
}
|
}
|
||||||
|
|
||||||
read_unlock(&GlobalSMBSeslock);
|
read_unlock(&GlobalSMBSeslock);
|
||||||
/* Had to unlock since following call can block */
|
/* Had to unlock since following call can block */
|
||||||
rc = cifs_reopen_file(open_file->pfile, FALSE);
|
rc = cifs_reopen_file(open_file->pfile, FALSE);
|
||||||
if (!rc) {
|
if (!rc) {
|
||||||
if (!open_file->closePend)
|
if (!open_file->closePend)
|
||||||
return open_file;
|
return open_file;
|
||||||
else { /* start over in case this was deleted */
|
else { /* start over in case this was deleted */
|
||||||
@ -1114,7 +1114,7 @@ refind_writable:
|
|||||||
/* can not use this handle, no write
|
/* can not use this handle, no write
|
||||||
pending on this one after all */
|
pending on this one after all */
|
||||||
atomic_dec(&open_file->wrtPending);
|
atomic_dec(&open_file->wrtPending);
|
||||||
|
|
||||||
if (open_file->closePend) /* list could have changed */
|
if (open_file->closePend) /* list could have changed */
|
||||||
goto refind_writable;
|
goto refind_writable;
|
||||||
/* else we simply continue to the next entry. Thus
|
/* else we simply continue to the next entry. Thus
|
||||||
|
Loading…
Reference in New Issue
Block a user