From patchwork Wed Jan 27 00:43:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 8128131 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 25E399F859 for ; Tue, 26 Jan 2016 22:44:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E24E20265 for ; Tue, 26 Jan 2016 22:44:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C15D20251 for ; Tue, 26 Jan 2016 22:44:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753126AbcAZWoH (ORCPT ); Tue, 26 Jan 2016 17:44:07 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33643 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752973AbcAZWny (ORCPT ); Tue, 26 Jan 2016 17:43:54 -0500 Received: by mail-wm0-f66.google.com with SMTP id r129so22213wmr.0 for ; Tue, 26 Jan 2016 14:43:54 -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=WYuvKwhVLHP13N82V0oVtbF3gRIAikMTOKxBAHlPgKI=; b=kRHb+eikFywUAa8qe3B8BL/CaYy8Bc1nRO4E0q1nB0tZosDqGg5iZz1cnMTSmrjStT TPsKSoyMqkjf6ARrieZh8d0Q786WFdWvb3kbml12UMKh4pVfV6nrQNyBZjmI26jlrdui 0h/u8P/xX7wcheQe8BVy0sOZf4xLQoegUyoDPXXdeyLGVgr8y3SaT1wULp5kypOuhqMI R2fnrOsjgLpS0ECIbuoW8nEqeg6STl5Y/+CFd1EQsYLmY5JjbAlQu14o+FmMjrNY3MzI FPTR/3uOIBTeTNuLrK1nGAarc5O504RFk263QT3Ome/dR/55QTwUIqeQblI+eVzt3AHN ndGw== 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=WYuvKwhVLHP13N82V0oVtbF3gRIAikMTOKxBAHlPgKI=; b=fceI+xY+QC7LiLlFmb/MCT5ogUOKnu92sgKX9XT5IO1Rybhi9focjbe6vSub4DShNp ajtwMHCxCwz/SGyGWrG+JIzcWRY9HgjNXBLij6XLe1dfp7armozIBDlPjrzmV9SKdrf6 16GTcsBeEkwvt9dYl4Y+kqqazsbIGe38SSHDGz+68xY8YC9yQ6bzMeF2BFyaWkGr3sCH Nfm7EUaAlYHusOsUk0nXQOqwbPxQYHqTpo7n/3C00JQ7NF+KPqdW+SHvk7PiCpbcD3e5 bUPGwyo3cm4h3Gjwn3AUxNTfW2/3SkuM0MpxtzqbWrTNAOThnUyjA32Uluw37Dxxq5AO t9Sw== X-Gm-Message-State: AG10YORocfvHKwTCwOmeAJwBRNzMXw1gB12jghOGmS8QCs1AHQ+7Ye5ByU0xZ6EPzZUbsg== X-Received: by 10.194.235.4 with SMTP id ui4mr21991942wjc.177.1453848233616; Tue, 26 Jan 2016 14:43:53 -0800 (PST) Received: from yoga.localdomain ([62.121.83.220]) by smtp.gmail.com with ESMTPSA id xx3sm3367444wjc.32.2016.01.26.14.43.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Jan 2016 14:43:53 -0800 (PST) From: Ioana Ciornei To: ceph-devel@vger.kernel.org Cc: elder@ieee.org, Ioana Ciornei Subject: [PATCH 5/6] net: ceph: messenger: change printk to pr_warn Date: Wed, 27 Jan 2016 02:43:38 +0200 Message-Id: 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 changes the printk call into the preferred function pr_warn(). Since the intention is to just warn the user it is the best level of facility. Signed-off-by: Ioana Ciornei --- net/ceph/messenger.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 6b15876..8f1582e 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -329,7 +329,8 @@ static void con_sock_state_init(struct ceph_connection *con) old_state = atomic_xchg(&con->sock_state, CON_SOCK_STATE_CLOSED); if (WARN_ON(old_state != CON_SOCK_STATE_NEW)) - printk("%s: unexpected old state %d\n", __func__, old_state); + pr_warn("%s: unexpected old state %d\n", __func__, + old_state); dout("%s con %p sock %d -> %d\n", __func__, con, old_state, CON_SOCK_STATE_CLOSED); } @@ -340,7 +341,8 @@ static void con_sock_state_connecting(struct ceph_connection *con) old_state = atomic_xchg(&con->sock_state, CON_SOCK_STATE_CONNECTING); if (WARN_ON(old_state != CON_SOCK_STATE_CLOSED)) - printk("%s: unexpected old state %d\n", __func__, old_state); + pr_warn("%s: unexpected old state %d\n", __func__, + old_state); dout("%s con %p sock %d -> %d\n", __func__, con, old_state, CON_SOCK_STATE_CONNECTING); } @@ -351,7 +353,8 @@ static void con_sock_state_connected(struct ceph_connection *con) old_state = atomic_xchg(&con->sock_state, CON_SOCK_STATE_CONNECTED); if (WARN_ON(old_state != CON_SOCK_STATE_CONNECTING)) - printk("%s: unexpected old state %d\n", __func__, old_state); + pr_warn("%s: unexpected old state %d\n", __func__, + old_state); dout("%s con %p sock %d -> %d\n", __func__, con, old_state, CON_SOCK_STATE_CONNECTED); } @@ -364,7 +367,8 @@ static void con_sock_state_closing(struct ceph_connection *con) if (WARN_ON(old_state != CON_SOCK_STATE_CONNECTING && old_state != CON_SOCK_STATE_CONNECTED && old_state != CON_SOCK_STATE_CLOSING)) - printk("%s: unexpected old state %d\n", __func__, old_state); + pr_warn("%s: unexpected old state %d\n", __func__, + old_state); dout("%s con %p sock %d -> %d\n", __func__, con, old_state, CON_SOCK_STATE_CLOSING); } @@ -378,7 +382,8 @@ static void con_sock_state_closed(struct ceph_connection *con) old_state != CON_SOCK_STATE_CLOSING && old_state != CON_SOCK_STATE_CONNECTING && old_state != CON_SOCK_STATE_CLOSED)) - printk("%s: unexpected old state %d\n", __func__, old_state); + pr_warn("%s: unexpected old state %d\n", __func__, + old_state); dout("%s con %p sock %d -> %d\n", __func__, con, old_state, CON_SOCK_STATE_CLOSED); }