From 0ee4df8736737378aadbaaee2d23264196d0b96c Mon Sep 17 00:00:00 2001 From: Sunil Mushran Date: Thu, 11 Jun 2009 11:02:03 -0700 Subject: [PATCH] --- yaml --- r: 151227 b: refs/heads/master c: 9af0b38ff3f4f79c62dd909405b113bf7c1a23aa h: refs/heads/master i: 151225: ec016ee498f0aba763dcff03502a9148f9c58186 151223: e2fbbe25ef55fe46eff8bc3d1d273fb9886dacde v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/cluster/tcp.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 45ad6bcbb3cd..e47549db74b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b791bcc8b2ae21daf95d18cff2f1eca7a64c9a5 +refs/heads/master: 9af0b38ff3f4f79c62dd909405b113bf7c1a23aa diff --git a/trunk/fs/ocfs2/cluster/tcp.c b/trunk/fs/ocfs2/cluster/tcp.c index 9fbe849f6344..334f231a422c 100644 --- a/trunk/fs/ocfs2/cluster/tcp.c +++ b/trunk/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;