From patchwork Wed Jan 27 00:43:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 8128111 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B2BC69F859 for ; Tue, 26 Jan 2016 22:44:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7EE320265 for ; Tue, 26 Jan 2016 22:44:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F104620251 for ; Tue, 26 Jan 2016 22:44:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753069AbcAZWn6 (ORCPT ); Tue, 26 Jan 2016 17:43:58 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34056 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752721AbcAZWnw (ORCPT ); Tue, 26 Jan 2016 17:43:52 -0500 Received: by mail-wm0-f68.google.com with SMTP id p63so15335wmp.1 for ; Tue, 26 Jan 2016 14:43:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=HNXz8wWW4QL/Jah7xD3DtCyR0Ybazv/GoZc/ccea/5I=; b=libpCAQpKCH0WzLNvu8B1i7SxfhYZaK2rT5izfBbXPALmnjusfeNnmvidwMEbWMmK9 pZGkRIkzCvKD8Av6xneMJx+ACeT7dFVh3PvrCl4kLWnq6bi2wld/Qt2BFZHdkCT6/PlW aL6fyGlWBnsuKMydO5SG4Cd/u8SElNQpxJjoS3z49ziS7e9QX7ECMJG5BdAe+A4eCGAI XlPaSxfDYt2qs6GXQV1yku6iX8DgBgRB799eWeBZmBbLOeT62XdJ3ou1QyoRIKLDmgks eUV0n/wF92pxdYXQ0B4AAvmJfhPVBhmKj1i4WHaiNMUZKeXkEKBXR2orEdsl2XrFz/cu vM2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=HNXz8wWW4QL/Jah7xD3DtCyR0Ybazv/GoZc/ccea/5I=; b=LFsYzWOi49YzsJ5w1/bugMYwasLVY9+m/Y0bHOBOL1AHPmJPc1T5CdkNKooYgR4t73 GDVSAjQzLu+PjTA33orZtwSf/O6pXzuI95coidg/jh9R64cQyL0/x6d3npeK7LaGjKHo KSjuQ7N+KGeCrCNfIvwo1CyjHVX7wXwVUcmwK9NkEL0IYIuZj2ErTmLqcVVCkQviQf75 zBFkepoKh58C2Rlz3MvlYA4N2I9bk0/VI4t5g5Lmg26Hbq379Nkgyds7U6gVkwFXtSXS 1NVsNJ7qksnpyIoFJyCP5b7IKPkwR87M+ziyaIk4AqhTRoEQH6WisDXzRXin3cNi29Hz +hcg== X-Gm-Message-State: AG10YORBOAFnf6n8azvHFUKAnYaHPmuvfUMs9coMN8Wf7e+b0VLoZBpfi/2Ryfq7V/oXsg== X-Received: by 10.194.79.194 with SMTP id l2mr11341370wjx.160.1453848231403; Tue, 26 Jan 2016 14:43:51 -0800 (PST) Received: from yoga.localdomain ([62.121.83.220]) by smtp.gmail.com with ESMTPSA id xx3sm3367444wjc.32.2016.01.26.14.43.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Jan 2016 14:43:51 -0800 (PST) From: Ioana Ciornei To: ceph-devel@vger.kernel.org Cc: elder@ieee.org, Ioana Ciornei Subject: [PATCH 3/6] net: ceph: messenger: add blank line after declarations Date: Wed, 27 Jan 2016 02:43:36 +0200 Message-Id: <26cb4650cf99734eef76913bb2d9916721858342.1453853617.git.ciorneiioana@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: References: In-Reply-To: References: Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds a blank line after declarations in order to follow the kernel coding style. Also, it adds spaces around a binary operator. Signed-off-by: Ioana Ciornei --- net/ceph/messenger.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 7a8bc51..6a0962d 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -389,6 +389,7 @@ static void con_sock_state_closed(struct ceph_connection *con) static void ceph_sock_data_ready(struct sock *sk) { struct ceph_connection *con = sk->sk_user_data; + if (atomic_read(&con->msgr->stopping)) { return; } @@ -457,6 +458,7 @@ static void set_sock_callbacks(struct socket *sock, struct ceph_connection *con) { struct sock *sk = sock->sk; + sk->sk_user_data = con; sk->sk_data_ready = ceph_sock_data_ready; sk->sk_write_space = ceph_sock_write_space; @@ -636,6 +638,7 @@ static void ceph_msg_remove(struct ceph_msg *msg) ceph_msg_put(msg); } + static void ceph_msg_remove_list(struct list_head *head) { while (!list_empty(head)) { @@ -1384,7 +1387,6 @@ static void prepare_write_keepalive(struct ceph_connection *con) /* * Connection negotiation. */ - static struct ceph_auth_handshake *get_connect_authorizer(struct ceph_connection *con, int *auth_proto) { @@ -1543,6 +1545,7 @@ static int write_partial_message_data(struct ceph_connection *con) { struct ceph_msg *msg = con->out_msg; struct ceph_msg_data_cursor *cursor = &msg->cursor; + bool do_datacrc = !ceph_test_opt(from_msgr(con->msgr), NOCRC); u32 crc; @@ -1677,6 +1680,7 @@ static int read_partial(struct ceph_connection *con, int left = end - con->in_base_pos; int have = size - left; int ret = ceph_tcp_recvmsg(con->sock, object + have, left); + if (ret <= 0) return ret; con->in_base_pos += ret; @@ -1904,7 +1908,7 @@ int ceph_parse_ips(const char *c, const char *end, int i, ret = -EINVAL; const char *p = c; - dout("parse_ips on '%.*s'\n", (int)(end-c), c); + dout("parse_ips on '%.*s'\n", (int)(end - c), c); for (i = 0; i < max_count; i++) { const char *ipend; struct sockaddr_storage *ss = &addr[i].in_addr; @@ -2479,6 +2483,7 @@ static int read_keepalive_ack(struct ceph_connection *con) struct ceph_timespec ceph_ts; size_t size = sizeof(ceph_ts); int ret = read_partial(con, size, size, &ceph_ts); + if (ret <= 0) return ret; ceph_decode_timespec(&con->last_keepalive_ack, &ceph_ts); @@ -3151,6 +3156,7 @@ bool ceph_con_keepalive_expired(struct ceph_connection *con, (con->peer_features & CEPH_FEATURE_MSGR_KEEPALIVE2)) { struct timespec now = CURRENT_TIME; struct timespec ts; + jiffies_to_timespec(interval, &ts); ts = timespec_add(con->last_keepalive_ack, ts); return timespec_compare(&now, &ts) >= 0;