diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-21 08:51:28 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:43:39 -0400 |
commit | 7c97c200e2c5aa8b1067bebb99df0a7c2e12ebf3 (patch) | |
tree | bc486a32cb322a58730be30f5c61d272e3fee54f | |
parent | beefebf1aa611242e022e71bae87034f415d3314 (diff) |
cifs: fix the type of cifs_demultiplex_thread()
... and get rid of a bogus typecast, while we are at it; it's not
just that we want a function returning int and not void, but cast
to pointer to function taking void * and returning void would be
(void (*)(void *)) and not (void *)(void *), TYVM...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/cifs/connect.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index ccc1afa0bf3b..e66297bad412 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -320,9 +320,10 @@ requeue_echo: | |||
320 | } | 320 | } |
321 | 321 | ||
322 | static int | 322 | static int |
323 | cifs_demultiplex_thread(struct TCP_Server_Info *server) | 323 | cifs_demultiplex_thread(void *p) |
324 | { | 324 | { |
325 | int length; | 325 | int length; |
326 | struct TCP_Server_Info *server = p; | ||
326 | unsigned int pdu_length, total_read; | 327 | unsigned int pdu_length, total_read; |
327 | struct smb_hdr *smb_buffer = NULL; | 328 | struct smb_hdr *smb_buffer = NULL; |
328 | struct smb_hdr *bigbuf = NULL; | 329 | struct smb_hdr *bigbuf = NULL; |
@@ -1791,7 +1792,7 @@ cifs_get_tcp_session(struct smb_vol *volume_info) | |||
1791 | * this will succeed. No need for try_module_get(). | 1792 | * this will succeed. No need for try_module_get(). |
1792 | */ | 1793 | */ |
1793 | __module_get(THIS_MODULE); | 1794 | __module_get(THIS_MODULE); |
1794 | tcp_ses->tsk = kthread_run((void *)(void *)cifs_demultiplex_thread, | 1795 | tcp_ses->tsk = kthread_run(cifs_demultiplex_thread, |
1795 | tcp_ses, "cifsd"); | 1796 | tcp_ses, "cifsd"); |
1796 | if (IS_ERR(tcp_ses->tsk)) { | 1797 | if (IS_ERR(tcp_ses->tsk)) { |
1797 | rc = PTR_ERR(tcp_ses->tsk); | 1798 | rc = PTR_ERR(tcp_ses->tsk); |