2012-08-13 06:27:59

by Ying Xue

[permalink] [raw]
Subject: [PATCH] dlm: cleanup send_to_sock routine

Remove unnecessary code form send_to_sock routine.

Signed-off-by: Ying Xue <[email protected]>
---
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 5c1b0e3..f8eefe2 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1358,8 +1358,7 @@ static void send_to_sock(struct connection *con)
}
cond_resched();
goto out;
- }
- if (ret <= 0)
+ } else if (ret < 0)
goto send_error;
}

@@ -1376,7 +1375,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);
@@ -1394,7 +1392,6 @@ out_connect:
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)
--
1.6.2.3


2012-08-13 15:02:35

by David Teigland

[permalink] [raw]
Subject: Re: [PATCH] dlm: cleanup send_to_sock routine

On Mon, Aug 13, 2012 at 02:29:55PM +0800, Ying Xue wrote:

> But I have submitted another patch:
> https://lkml.org/lkml/2012/8/9/668

Yes I got it, to see all the patches I've pushed out, check here:
http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/teigland/linux-dlm.git;a=shortlog;h=refs/heads/next

> Remove unnecessary code form send_to_sock routine.

ok