ocfs2/net: Use wait_event() in o2net_send_message_vec()
PATCH 1/1 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 <[email protected]>
--- fs/ocfs2/cluster/tcp.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
fs/ocfs2/cluster/tcp.c +2 -5
@@ -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,size_t caller_veclen,u8 target_node,int *status) { -int ret, error =0 ; +int ret;struct o2net_msg *msg =NULL ;size_t veclen, caller_bytes =0 ;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); - ret =wait_event_interruptible (nn->nn_sc_wq, -o2net_tx_can_proceed (nn, &sc, &error)); -if (!ret && error) - ret = error; +wait_event (nn->nn_sc_wq,o2net_tx_can_proceed (nn, &sc, &ret));if (ret) goto out;
Signature · 1 line
1.6.0.4
PATCH 1/1 ocfs2/net: Use wait_event() in o2net_send_message_vec()
Quoted 3 lines · Sunil Mushran
Replace
wait_event_interruptible()withwait_event()ino2net_send_message_vec(). This is because this function is called by the dlm that expects signals to be blocked.
Added to the tree.
Joel
Signature · 10 lines
"Conservative, n. A statesman who is enamoured of existing evils, as distinguished from the Liberal, who wishes to replace them with others." - Ambrose Bierce, The Devil's Dictionary Joel Becker Principal Software Developer Oracle E-mail: joel.becker at oracle.com Phone: (650) 506-8127