diff options
author | Sage Weil <sage@newdream.net> | 2008-11-13 23:31:57 +0100 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2008-11-13 23:31:57 +0100 |
commit | fdbd20ed51d528170a50356874ec87cad605fd90 (patch) | |
tree | 8f8bb5354e50041fa19c0e458a6224348315277f | |
parent | mon: standardize storage of monmap revisions (diff) | |
download | ceph-fdbd20ed51d528170a50356874ec87cad605fd90.tar.xz ceph-fdbd20ed51d528170a50356874ec87cad605fd90.zip |
kclient: whitespace
-rw-r--r-- | src/kernel/ceph_tools.c | 2 | ||||
-rw-r--r-- | src/kernel/messenger.c | 14 | ||||
-rw-r--r-- | src/kernel/osdmap.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/kernel/ceph_tools.c b/src/kernel/ceph_tools.c index 4951714911e..9994af6bccd 100644 --- a/src/kernel/ceph_tools.c +++ b/src/kernel/ceph_tools.c @@ -79,7 +79,7 @@ void ceph_kfree(void *ptr) } if (overrun) { - derr(0, "Memory allocated at %s(%d): p=%p (%zu bytes)\n", p->fname, + derr(0, "Memory allocated at %s(%d): p=%p (%zu bytes)\n", p->fname, p->line, ((void *)p)+sizeof(struct alloc_data), p->size); diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c index fe75a92e57c..7aec3bcba06 100644 --- a/src/kernel/messenger.c +++ b/src/kernel/messenger.c @@ -1191,7 +1191,7 @@ static int process_accept(struct ceph_connection *con) u32 peer_cseq = le32_to_cpu(con->in_connect.connect_seq); bool retry = true; bool replace = false; - + dout(10, "process_accept %p got gseq %d cseq %d\n", con, peer_gseq, peer_cseq); @@ -1208,7 +1208,7 @@ static int process_accept(struct ceph_connection *con) con->error_msg = "out of memory"; return -1; } - + memset(&con->out_reply, 0, sizeof(con->out_reply)); spin_lock(&msgr->con_lock); @@ -1237,14 +1237,14 @@ static int process_accept(struct ceph_connection *con) replace = true; goto accept; } - + /* old attempt or peer didn't get the READY */ con->out_reply.tag = CEPH_MSGR_TAG_RETRY_SESSION; con->out_reply.connect_seq = cpu_to_le32(con->connect_seq); goto reply; } - + if (peer_cseq == existing->connect_seq) { /* connection race */ dout(20, "process_accept connection race state = %lu\n", @@ -1261,7 +1261,7 @@ static int process_accept(struct ceph_connection *con) con->out_reply.tag = CEPH_MSGR_TAG_WAIT; goto reply; } - + if (existing->connect_seq == 0 && peer_cseq > existing->connect_seq) { /* we reset and already reconnecting */ @@ -1276,7 +1276,7 @@ static int process_accept(struct ceph_connection *con) con->out_reply.tag = CEPH_MSGR_TAG_RESETSESSION; goto reply; } - + /* reconnect, replace connection */ replace = true; goto accept; @@ -1298,7 +1298,7 @@ accept: con->peer_global_seq = peer_gseq; dout(10, "process_accept %p cseq %d peer_gseq %d %s\n", con, con->connect_seq, peer_gseq, replace ? "replace" : "new"); - + con->out_reply.tag = CEPH_MSGR_TAG_READY; con->out_reply.global_seq = get_global_seq(con->msgr, 0); con->out_reply.connect_seq = peer_cseq + 1; diff --git a/src/kernel/osdmap.c b/src/kernel/osdmap.c index 35c4a38e46e..e61f4ce28f4 100644 --- a/src/kernel/osdmap.c +++ b/src/kernel/osdmap.c @@ -374,7 +374,7 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end) sizeof(*map->osd_addr)), bad); *p += 4; /* skip length field (should match max) */ ceph_decode_copy(p, map->osd_state, map->max_osd); - + *p += 4; /* skip length field (should match max) */ for (i = 0; i < map->max_osd; i++) ceph_decode_32(p, map->osd_weight[i]); |