diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2009-06-11 20:02:03 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-06-15 23:50:14 +0200 |
| commit | 9af0b38ff3f4f79c62dd909405b113bf7c1a23aa (patch) | |
| tree | 9e0071a36969f435d784483f9902e498725dd875 /fs/ocfs2/cluster | |
| parent | ocfs2: Adjust rightmost path in ocfs2_add_branch. (diff) | |
| download | linux-9af0b38ff3f4f79c62dd909405b113bf7c1a23aa.tar.xz linux-9af0b38ff3f4f79c62dd909405b113bf7c1a23aa.zip | |
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>
Diffstat (limited to 'fs/ocfs2/cluster')
| -rw-r--r-- | fs/ocfs2/cluster/tcp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index 9fbe849f6344..334f231a422c 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -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; |