From: Alex Elder <elder@inktank.com>
To: ceph-devel <ceph-devel@vger.kernel.org>
Subject: [PATCH 5/5] libceph: indent properly
Date: Tue, 19 Feb 2013 18:57:09 -0600 [thread overview]
Message-ID: <51241F65.7060109@inktank.com> (raw)
In-Reply-To: <51241E15.80903@inktank.com>
This is just the second part of a two-part patch. It simply
indents a block of code. This patch is going to be merged into
its predecessor following review.
Signed-off-by: Alex Elder <elder@inktank.com>
---
net/ceph/messenger.c | 80
+++++++++++++++++++++++++-------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 609f2eb..8f1272d 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2341,50 +2341,50 @@ static void con_work(struct work_struct *work)
bool fault;
mutex_lock(&con->mutex);
-while (true) {
- int ret;
+ while (true) {
+ int ret;
- if ((fault = con_sock_closed(con))) {
- dout("con_work %p SOCK_CLOSED\n", con);
- break;
- }
- if (con_backoff(con)) {
- dout("con_work %p BACKOFF\n", con);
- break;
- }
- if (con->state == CON_STATE_STANDBY) {
- dout("con_work %p STANDBY\n", con);
- break;
- }
- if (con->state == CON_STATE_CLOSED) {
- dout("con_work %p CLOSED\n", con);
- BUG_ON(con->sock);
- break;
- }
- if (con->state == CON_STATE_PREOPEN) {
- dout("con_work %p OPENING\n", con);
- BUG_ON(con->sock);
- }
+ if ((fault = con_sock_closed(con))) {
+ dout("con_work %p SOCK_CLOSED\n", con);
+ break;
+ }
+ if (con_backoff(con)) {
+ dout("con_work %p BACKOFF\n", con);
+ break;
+ }
+ if (con->state == CON_STATE_STANDBY) {
+ dout("con_work %p STANDBY\n", con);
+ break;
+ }
+ if (con->state == CON_STATE_CLOSED) {
+ dout("con_work %p CLOSED\n", con);
+ BUG_ON(con->sock);
+ break;
+ }
+ if (con->state == CON_STATE_PREOPEN) {
+ dout("con_work %p OPENING\n", con);
+ BUG_ON(con->sock);
+ }
- ret = try_read(con);
- if (ret < 0) {
- if (ret == -EAGAIN)
- continue;
- con->error_msg = "socket error on read";
- fault = true;
- break;
- }
+ ret = try_read(con);
+ if (ret < 0) {
+ if (ret == -EAGAIN)
+ continue;
+ con->error_msg = "socket error on read";
+ fault = true;
+ break;
+ }
- ret = try_write(con);
- if (ret < 0) {
- if (ret == -EAGAIN)
- continue;
- con->error_msg = "socket error on write";
- fault = true;
- }
+ ret = try_write(con);
+ if (ret < 0) {
+ if (ret == -EAGAIN)
+ continue;
+ con->error_msg = "socket error on write";
+ fault = true;
+ }
- break; /* If we make it to here, we're done */
-}
+ break; /* If we make it to here, we're done */
+ }
if (fault)
con_fault(con);
mutex_unlock(&con->mutex);
--
1.7.9.5
prev parent reply other threads:[~2013-02-20 0:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 0:51 [PATCH 0/5] libceph clean up con_work() Alex Elder
2013-02-20 0:55 ` [PATCH 1/5] libceph: encapsulate connection backoff Alex Elder
2013-02-20 0:55 ` [PATCH 2/5] libceph: separate non-locked fault handling Alex Elder
2013-02-20 0:56 ` [PATCH 3/5] libceph: use a flag to indicate a fault has occurred Alex Elder
2013-02-20 0:56 ` [PATCH 4/5] libceph: use a do..while loop in con_work() Alex Elder
2013-02-20 0:57 ` Alex Elder [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51241F65.7060109@inktank.com \
--to=elder@inktank.com \
--cc=ceph-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.