diff options
author | Ying Xue <ying.xue@windriver.com> | 2012-08-13 02:29:55 -0400 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2012-08-13 11:03:18 -0400 |
commit | 9c5bef5849c9fde1a37ac005299f759440cbaf4c (patch) | |
tree | 180b79ac5486f097feb5b15f53afb64c7c1eb14e | |
parent | 4dd40f0cd99a3500c6df80eb8f537678559c761e (diff) |
dlm: cleanup send_to_sock routine
Remove unnecessary code form send_to_sock routine.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David Teigland <teigland@redhat.com>
-rw-r--r-- | fs/dlm/lowcomms.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 3637f3f18824..331ea4f94efd 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c | |||
@@ -1486,8 +1486,7 @@ static void send_to_sock(struct connection *con) | |||
1486 | } | 1486 | } |
1487 | cond_resched(); | 1487 | cond_resched(); |
1488 | goto out; | 1488 | goto out; |
1489 | } | 1489 | } else if (ret < 0) |
1490 | if (ret <= 0) | ||
1491 | goto send_error; | 1490 | goto send_error; |
1492 | } | 1491 | } |
1493 | 1492 | ||
@@ -1504,7 +1503,6 @@ static void send_to_sock(struct connection *con) | |||
1504 | if (e->len == 0 && e->users == 0) { | 1503 | if (e->len == 0 && e->users == 0) { |
1505 | list_del(&e->list); | 1504 | list_del(&e->list); |
1506 | free_entry(e); | 1505 | free_entry(e); |
1507 | continue; | ||
1508 | } | 1506 | } |
1509 | } | 1507 | } |
1510 | spin_unlock(&con->writequeue_lock); | 1508 | spin_unlock(&con->writequeue_lock); |
@@ -1522,7 +1520,6 @@ out_connect: | |||
1522 | mutex_unlock(&con->sock_mutex); | 1520 | mutex_unlock(&con->sock_mutex); |
1523 | if (!test_bit(CF_INIT_PENDING, &con->flags)) | 1521 | if (!test_bit(CF_INIT_PENDING, &con->flags)) |
1524 | lowcomms_connect_sock(con); | 1522 | lowcomms_connect_sock(con); |
1525 | return; | ||
1526 | } | 1523 | } |
1527 | 1524 | ||
1528 | static void clean_one_writequeue(struct connection *con) | 1525 | static void clean_one_writequeue(struct connection *con) |