cifs: use kthread_ API
PATCH 1/1 cifs: use kthread_ API
Use the kthread_ API instead of opencoding lots of hairy code for kernel thread creation and teardown.
Also cleanup cifs_init to properly unwind when thread creation fails.
Signed-off-by Christoph Hellwig <[email protected]>
fs/cifs/connect.c +16 -27
@@ -31,6 +31,7 @@#include <linux/delay.h> #include <linux/completion.h> #include <linux/pagevec.h> +#include <linux/kthread.h> #include <asm/uaccess.h> #include <asm/processor.h> #include "cifspdu.h"
@@ -47,8 +48,6 @@#define CIFS_PORT 445#define RFC1001_PORT 139 -static DECLARE_COMPLETION (cifsd_complete); -extern void SMBencrypt (unsigned char *passwd,unsigned char *c8,unsigned char *p24); extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8,
@@ -329,8 +328,9 @@ }static int -cifs_demultiplex_thread (struct TCP_Server_Info *server) +cifs_demultiplex_thread (void *data) { +struct TCP_Server_Info *server = data;int length;unsigned int pdu_length, total_read;struct smb_hdr *smb_buffer =NULL ;
@@ -348,23 +348,20 @@int isMultiRsp;int reconnect; -daemonize ("cifsd" ); -allow_signal (SIGKILL ); current->flags |=PF_MEMALLOC ; - server->tsk = current;/* save process info to wake at shutdown */ cFYI (1 , ("Demultiplex PID: %d" , current->pid));write_lock (&GlobalSMBSeslock);atomic_inc (&tcpSesAllocCount); length = tcpSesAllocCount.counter;write_unlock (&GlobalSMBSeslock); -complete (&cifsd_complete); +if (length >1 ) {mempool_resize (cifs_req_poolp, length + cifs_min_rcv,GFP_KERNEL ); } -while (server->tcpStatus != CifsExiting) { +while (server->tcpStatus != CifsExiting && !kthread_should_stop ()) {if (try_to_freeze ())continue ;if (bigbuf ==NULL ) {
@@ -403,7 +400,7 @@kernel_recvmsg (csocket, &smb_msg, &iov,1 ,4 ,0 /* BB see socket.h flags */ ); -if (server->tcpStatus == CifsExiting) { +if (server->tcpStatus == CifsExiting ||kthread_should_stop ()) {break ; }else if (server->tcpStatus == CifsNeedReconnect) {cFYI (1 ,("Reconnect after server stopped responding" ));
@@ -749,7 +746,6 @@ GFP_KERNEL); } -complete_and_exit (&cifsd_complete,0 );return 0 ; }
@@ -1713,17 +1709,17 @@so no need to spinlock this init of tcpStatus */ srvTcp->tcpStatus = CifsNew;init_MUTEX (&srvTcp->tcpSem); - rc = (int )kernel_thread ((void *)(void *)cifs_demultiplex_thread, srvTcp, -CLONE_FS |CLONE_FILES |CLONE_VM ); -if (rc <0 ) { - rc = -ENOMEM ; + + srvTcp->tsk =kthread_create (cifs_demultiplex_thread, srvTcp,"cifsd" ); +if (IS_ERR (srvTcp->tsk)) { + rc =PTR_ERR (srvTcp->tsk);sock_release (csocket);kfree (volume_info.UNC);kfree (volume_info.password);FreeXid (xid);return rc; } -wait_for_completion (&cifsd_complete); + rc =0 ;memcpy (srvTcp->workstation_RFC1001_name, volume_info.source_rfc1001_name,16 );memcpy (srvTcp->server_RFC1001_name, volume_info.target_rfc1001_name,16 );
@@ -1889,10 +1885,7 @@spin_lock (&GlobalMid_Lock); srvTcp->tcpStatus = CifsExiting;spin_unlock (&GlobalMid_Lock); -if (srvTcp->tsk) { -send_sig (SIGKILL ,srvTcp->tsk,1 ); -wait_for_completion (&cifsd_complete); - } +kthread_stop (srvTcp->tsk); }/* If find_unc succeeded then rc == 0 so we can not end */ if (tcon)/* up accidently freeing someone elses tcon struct */
@@ -1905,10 +1898,8 @@ temp_rc =CIFSSMBLogoff (xid, pSesInfo);/* if the socketUseCount is now zero */ if ((temp_rc == -ESHUTDOWN ) && - (pSesInfo->server->tsk)) { -send_sig (SIGKILL ,pSesInfo->server->tsk,1 ); -wait_for_completion (&cifsd_complete); - } + (pSesInfo->server->tsk)) +kthread_stop (srvTcp->tsk); }else cFYI (1 , ("No session or bad tcon" ));sesInfoFree (pSesInfo);
@@ -3387,10 +3378,8 @@return 0 ; }else if (rc == -ESHUTDOWN ) {cFYI (1 ,("Waking up socket by sending it signal" )); -if (cifsd_task) { -send_sig (SIGKILL ,cifsd_task,1 ); -wait_for_completion (&cifsd_complete); - } +if (cifsd_task) +kthread_stop (cifsd_task); rc =0 ; }/* else - we have an smb session left on this socket do not kill cifsd */
fs/cifs/cifsfs.c +50 -49
148 lines not on this page · raw message