From dc52e067a77b2a9d082da44d021b7026f0b94eaf Mon Sep 17 00:00:00 2001 From: Ying Xue Date: Mon, 13 Aug 2012 14:29:55 +0800 Subject: [PATCH] --- yaml --- r: 326218 b: refs/heads/master c: 9c5bef5849c9fde1a37ac005299f759440cbaf4c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/dlm/lowcomms.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 30284069dec4..6b254361cb4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4dd40f0cd99a3500c6df80eb8f537678559c761e +refs/heads/master: 9c5bef5849c9fde1a37ac005299f759440cbaf4c diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c index 3637f3f18824..331ea4f94efd 100644 --- a/trunk/fs/dlm/lowcomms.c +++ b/trunk/fs/dlm/lowcomms.c @@ -1486,8 +1486,7 @@ static void send_to_sock(struct connection *con) } cond_resched(); goto out; - } - if (ret <= 0) + } else if (ret < 0) goto send_error; } @@ -1504,7 +1503,6 @@ static void send_to_sock(struct connection *con) if (e->len == 0 && e->users == 0) { list_del(&e->list); free_entry(e); - continue; } } spin_unlock(&con->writequeue_lock); @@ -1522,7 +1520,6 @@ static void send_to_sock(struct connection *con) mutex_unlock(&con->sock_mutex); if (!test_bit(CF_INIT_PENDING, &con->flags)) lowcomms_connect_sock(con); - return; } static void clean_one_writequeue(struct connection *con)