Skip to content

E
etercifs
Commit e3e64e26 authored by Konstantin Baev's avatar Konstantin Baev
Browse files
Options

Update sources 2.6.27 - 2.6.28

Refactoring code, which solved kmem_cache_destroy problem
parent 43e50e37
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
sources/2.6.27/cifsglob.h
View file @ e3e64e26
...@@ -176,7 +176,7 @@ struct TCP_Server_Info { ...@@ -176,7 +176,7 @@ struct TCP_Server_Info {
struct mac_key mac_signing_key; struct mac_key mac_signing_key;
char ntlmv2_hash[16]; char ntlmv2_hash[16];
unsigned long lstrp; /* when we got last response from this server */ unsigned long lstrp; /* when we got last response from this server */
int running; struct completion done;
}; };
/* /*
......
sources/2.6.27/connect.c
View file @ e3e64e26
...@@ -348,7 +348,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server) ...@@ -348,7 +348,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)
bool isMultiRsp; bool isMultiRsp;
int reconnect; int reconnect;
server->running = 1; init_completion(&server->done);
current->flags |= PF_MEMALLOC; current->flags |= PF_MEMALLOC;
cFYI(1, ("Demultiplex PID: %d", task_pid_nr(current))); cFYI(1, ("Demultiplex PID: %d", task_pid_nr(current)));
...@@ -760,9 +760,6 @@ multi_t2_fnd: ...@@ -760,9 +760,6 @@ multi_t2_fnd:
kfree(server->hostname); kfree(server->hostname);
task_to_wake = xchg(&server->tsk, NULL); task_to_wake = xchg(&server->tsk, NULL);
server->running = 0;
msleep(20);
kfree(server);
length = atomic_dec_return(&tcpSesAllocCount); length = atomic_dec_return(&tcpSesAllocCount);
if (length > 0) if (length > 0)
...@@ -779,6 +776,8 @@ multi_t2_fnd: ...@@ -779,6 +776,8 @@ multi_t2_fnd:
set_current_state(TASK_RUNNING); set_current_state(TASK_RUNNING);
} }
complete_all(&server->done);
return 0; return 0;
} }
...@@ -1424,8 +1423,9 @@ cifs_put_tcp_session(struct TCP_Server_Info *server) ...@@ -1424,8 +1423,9 @@ cifs_put_tcp_session(struct TCP_Server_Info *server)
if (task) if (task)
force_sig(SIGKILL, task); force_sig(SIGKILL, task);
while(server->running == 1) wait_for_completion_interruptible(&server->done);
msleep(10);
kfree(server);
} }
static struct cifsSesInfo * static struct cifsSesInfo *
......
sources/2.6.28/cifsglob.h
View file @ e3e64e26
...@@ -176,7 +176,7 @@ struct TCP_Server_Info { ...@@ -176,7 +176,7 @@ struct TCP_Server_Info {
struct mac_key mac_signing_key; struct mac_key mac_signing_key;
char ntlmv2_hash[16]; char ntlmv2_hash[16];
unsigned long lstrp; /* when we got last response from this server */ unsigned long lstrp; /* when we got last response from this server */
int running; struct completion done;
}; };
/* /*
......
sources/2.6.28/connect.c
View file @ e3e64e26
...@@ -350,7 +350,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server) ...@@ -350,7 +350,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)
bool isMultiRsp; bool isMultiRsp;
int reconnect; int reconnect;
server->running = 1; init_completion(&server->done);
current->flags |= PF_MEMALLOC; current->flags |= PF_MEMALLOC;
cFYI(1, ("Demultiplex PID: %d", task_pid_nr(current))); cFYI(1, ("Demultiplex PID: %d", task_pid_nr(current)));
...@@ -761,9 +761,6 @@ multi_t2_fnd: ...@@ -761,9 +761,6 @@ multi_t2_fnd:
kfree(server->hostname); kfree(server->hostname);
task_to_wake = xchg(&server->tsk, NULL); task_to_wake = xchg(&server->tsk, NULL);
server->running = 0;
msleep(20);
kfree(server);
length = atomic_dec_return(&tcpSesAllocCount); length = atomic_dec_return(&tcpSesAllocCount);
if (length > 0) if (length > 0)
...@@ -780,6 +777,8 @@ multi_t2_fnd: ...@@ -780,6 +777,8 @@ multi_t2_fnd:
set_current_state(TASK_RUNNING); set_current_state(TASK_RUNNING);
} }
complete_all(&server->done);
return 0; return 0;
} }
...@@ -1431,8 +1430,9 @@ cifs_put_tcp_session(struct TCP_Server_Info *server) ...@@ -1431,8 +1430,9 @@ cifs_put_tcp_session(struct TCP_Server_Info *server)
if (task) if (task)
force_sig(SIGKILL, task); force_sig(SIGKILL, task);
while(server->running == 1) wait_for_completion_interruptible(&server->done);
msleep(10);
kfree(server);
} }
static struct cifsSesInfo * static struct cifsSesInfo *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment