aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-11-16 18:05:52 -0500
committerSteve French <sfrench@us.ibm.com>2007-11-16 18:05:52 -0500
commit8840dee9dc53883883c321d2811e9f87700d9350 (patch)
treeb1d66f2312f730bcda50d2aa857ff389d93ac4a7 /fs
parentd6c2e4d02b72d8ae63784bdc57cfa285128de211 (diff)
[CIFS] minor checkpatch cleanup
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/cifsproto.h10
-rw-r--r--fs/cifs/connect.c2
-rw-r--r--fs/cifs/file.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 3a37c6c67f6..3748104dded 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -248,15 +248,15 @@ extern int CIFSSMBQueryReparseLinkInfo(const int xid,
248extern int CIFSSMBOpen(const int xid, struct cifsTconInfo *tcon, 248extern int CIFSSMBOpen(const int xid, struct cifsTconInfo *tcon,
249 const char *fileName, const int disposition, 249 const char *fileName, const int disposition,
250 const int access_flags, const int omode, 250 const int access_flags, const int omode,
251 __u16 * netfid, int *pOplock, FILE_ALL_INFO *, 251 __u16 *netfid, int *pOplock, FILE_ALL_INFO *,
252 const struct nls_table *nls_codepage, int remap); 252 const struct nls_table *nls_codepage, int remap);
253extern int SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon, 253extern int SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon,
254 const char *fileName, const int disposition, 254 const char *fileName, const int disposition,
255 const int access_flags, const int omode, 255 const int access_flags, const int omode,
256 __u16 * netfid, int *pOplock, FILE_ALL_INFO *, 256 __u16 *netfid, int *pOplock, FILE_ALL_INFO *,
257 const struct nls_table *nls_codepage, int remap); 257 const struct nls_table *nls_codepage, int remap);
258extern int CIFSPOSIXCreate(const int xid, struct cifsTconInfo *tcon, 258extern int CIFSPOSIXCreate(const int xid, struct cifsTconInfo *tcon,
259 u32 posix_flags, __u64 mode, __u16 * netfid, 259 u32 posix_flags, __u64 mode, __u16 *netfid,
260 FILE_UNIX_BASIC_INFO *pRetData, 260 FILE_UNIX_BASIC_INFO *pRetData,
261 __u32 *pOplock, const char *name, 261 __u32 *pOplock, const char *name,
262 const struct nls_table *nls_codepage, int remap); 262 const struct nls_table *nls_codepage, int remap);
@@ -277,7 +277,7 @@ extern int CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
277 const __u64 offset, unsigned int *nbytes, 277 const __u64 offset, unsigned int *nbytes,
278 struct kvec *iov, const int nvec, const int long_op); 278 struct kvec *iov, const int nvec, const int long_op);
279extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon, 279extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
280 const unsigned char *searchName, __u64 * inode_number, 280 const unsigned char *searchName, __u64 *inode_number,
281 const struct nls_table *nls_codepage, 281 const struct nls_table *nls_codepage,
282 int remap_special_chars); 282 int remap_special_chars);
283extern int cifs_convertUCSpath(char *target, const __le16 *source, int maxlen, 283extern int cifs_convertUCSpath(char *target, const __le16 *source, int maxlen,
@@ -352,5 +352,5 @@ extern int CIFSSMBSetPosixACL(const int xid, struct cifsTconInfo *tcon,
352 const char *local_acl, const int buflen, const int acl_type, 352 const char *local_acl, const int buflen, const int acl_type,
353 const struct nls_table *nls_codepage, int remap_special_chars); 353 const struct nls_table *nls_codepage, int remap_special_chars);
354extern int CIFSGetExtAttr(const int xid, struct cifsTconInfo *tcon, 354extern int CIFSGetExtAttr(const int xid, struct cifsTconInfo *tcon,
355 const int netfid, __u64 * pExtAttrBits, __u64 *pMask); 355 const int netfid, __u64 *pExtAttrBits, __u64 *pMask);
356#endif /* _CIFSPROTO_H */ 356#endif /* _CIFSPROTO_H */
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 98ec57ff4d9..c4b32b7f435 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1944,7 +1944,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
1944 srvTcp->tcpStatus = CifsNew; 1944 srvTcp->tcpStatus = CifsNew;
1945 init_MUTEX(&srvTcp->tcpSem); 1945 init_MUTEX(&srvTcp->tcpSem);
1946 srvTcp->tsk = kthread_run((void *)(void *)cifs_demultiplex_thread, srvTcp, "cifsd"); 1946 srvTcp->tsk = kthread_run((void *)(void *)cifs_demultiplex_thread, srvTcp, "cifsd");
1947 if ( IS_ERR(srvTcp->tsk) ) { 1947 if (IS_ERR(srvTcp->tsk)) {
1948 rc = PTR_ERR(srvTcp->tsk); 1948 rc = PTR_ERR(srvTcp->tsk);
1949 cERROR(1, ("error %d create cifsd thread", rc)); 1949 cERROR(1, ("error %d create cifsd thread", rc));
1950 srvTcp->tsk = NULL; 1950 srvTcp->tsk = NULL;
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 82326d2142e..80256419651 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1087,11 +1087,11 @@ refind_writable:
1087 read_unlock(&GlobalSMBSeslock); 1087 read_unlock(&GlobalSMBSeslock);
1088 return open_file; 1088 return open_file;
1089 } 1089 }
1090 1090
1091 read_unlock(&GlobalSMBSeslock); 1091 read_unlock(&GlobalSMBSeslock);
1092 /* Had to unlock since following call can block */ 1092 /* Had to unlock since following call can block */
1093 rc = cifs_reopen_file(open_file->pfile, FALSE); 1093 rc = cifs_reopen_file(open_file->pfile, FALSE);
1094 if (!rc) { 1094 if (!rc) {
1095 if (!open_file->closePend) 1095 if (!open_file->closePend)
1096 return open_file; 1096 return open_file;
1097 else { /* start over in case this was deleted */ 1097 else { /* start over in case this was deleted */
@@ -1114,7 +1114,7 @@ refind_writable:
1114 /* can not use this handle, no write 1114 /* can not use this handle, no write
1115 pending on this one after all */ 1115 pending on this one after all */
1116 atomic_dec(&open_file->wrtPending); 1116 atomic_dec(&open_file->wrtPending);
1117 1117
1118 if (open_file->closePend) /* list could have changed */ 1118 if (open_file->closePend) /* list could have changed */
1119 goto refind_writable; 1119 goto refind_writable;
1120 /* else we simply continue to the next entry. Thus 1120 /* else we simply continue to the next entry. Thus