openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ocfs2/net: Use wait_event() in o2net_send_message_vec() 

Replace wait_event_interruptible() with wait_event() in o2net_send_message_vec().
This is because this function is called by the dlm that expects signals to be
blocked.

Fixes oss bugzilla#1126
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1126

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
This commit is contained in:
Sunil Mushran 2009-06-11 11:02:03 -07:00 committed by Joel Becker
parent 6b791bcc8b
commit 9af0b38ff3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/ocfs2/cluster/tcp.c
View File

@ -974,7 +974,7 @@ static int o2net_tx_can_proceed(struct o2net_node *nn,
int o2net_send_message_vec(u32 msg_type, u32 key, struct kvec *caller_vec, int o2net_send_message_vec(u32 msg_type, u32 key, struct kvec *caller_vec,
size_t caller_veclen, u8 target_node, int *status) size_t caller_veclen, u8 target_node, int *status)
{ {
int ret, error = 0; int ret;
struct o2net_msg *msg = NULL; struct o2net_msg *msg = NULL;
size_t veclen, caller_bytes = 0; size_t veclen, caller_bytes = 0;
struct kvec *vec = NULL; struct kvec *vec = NULL;
@ -1015,10 +1015,7 @@ int o2net_send_message_vec(u32 msg_type, u32 key, struct kvec *caller_vec,
o2net_set_nst_sock_time(&nst); o2net_set_nst_sock_time(&nst);
ret = wait_event_interruptible(nn->nn_sc_wq, wait_event(nn->nn_sc_wq, o2net_tx_can_proceed(nn, &sc, &ret));
o2net_tx_can_proceed(nn, &sc, &error));
if (!ret && error)
ret = error;
if (ret) if (ret)
goto out; goto out;