From patchwork Thu May 14 16:06:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 472390 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EF3921401B5 for ; Fri, 15 May 2015 02:08:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=GNJuTJy+; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964914AbbENQIQ (ORCPT ); Thu, 14 May 2015 12:08:16 -0400 Received: from mail-qk0-f173.google.com ([209.85.220.173]:36129 "EHLO mail-qk0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422659AbbENQGt (ORCPT ); Thu, 14 May 2015 12:06:49 -0400 Received: by qkgw4 with SMTP id w4so12116632qkg.3; Thu, 14 May 2015 09:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=OMtwuPLetuflm007mSm0j5YDeXKhTuwHi6oD3cm2JyM=; b=GNJuTJy+2U4mudKOYb0ZUdeU8D9Dlr4QvGuPlDiugpy457JeKauv8mnRBhPOnKWlu4 TWqXc4NSs9/yveijHCPjs0mxQPRUXa0Mla07sLprVQeZytqEWkOrQpi0M6B9xnAMPEZq IK6UVN+ywNnqYU7EL986Z/s1WQkX3IzUttK7TQ7+KAaQBIJ4VMLXTeg/zUruTbxHzpNb qicgiLuM7YCWWxvsRFOJMXfDar/aBV+++7VegdL1ZwHc7qer2xko4JsRfQkZQ2Vn4gEw FYG3EPUQloxUTqWQ7eN9XUx+Gu1n9+oIgZtlFxuu7pK7qHlYDN7JboR+YcqcSD2Dkbbo ugvQ== X-Received: by 10.140.21.69 with SMTP id 63mr6400544qgk.34.1431619607683; Thu, 14 May 2015 09:06:47 -0700 (PDT) Received: from htj.duckdns.org.lan (207-38-238-8.c3-0.wsd-ubr1.qens-wsd.ny.cable.rcn.com. [207.38.238.8]) by mx.google.com with ESMTPSA id y195sm18099132qky.24.2015.05.14.09.06.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 09:06:46 -0700 (PDT) From: Tejun Heo To: akpm@linux-foundation.org Cc: davem@davemloft.net, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Tejun Heo Subject: [PATCH 5/7] netconsole: make netconsole_target->enabled a bool Date: Thu, 14 May 2015 12:06:24 -0400 Message-Id: <1431619586-29187-6-git-send-email-tj@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431619586-29187-1-git-send-email-tj@kernel.org> References: <1431619586-29187-1-git-send-email-tj@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org netconsole uses both bool and int for boolean values. Let's convert nt->enabled to bool for consistency. Signed-off-by: Tejun Heo Cc: David Miller --- drivers/net/netconsole.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 30c0524..8dd1e55 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -104,7 +104,7 @@ struct netconsole_target { #ifdef CONFIG_NETCONSOLE_DYNAMIC struct config_item item; #endif - int enabled; + bool enabled; struct mutex mutex; struct netpoll np; }; @@ -197,7 +197,7 @@ static struct netconsole_target *alloc_param_target(char *target_config) if (err) goto fail; - nt->enabled = 1; + nt->enabled = true; return nt; @@ -322,13 +322,13 @@ static ssize_t store_enabled(struct netconsole_target *nt, return err; if (enabled < 0 || enabled > 1) return -EINVAL; - if (enabled == nt->enabled) { + if ((bool)enabled == nt->enabled) { pr_info("network logging has already %s\n", nt->enabled ? "started" : "stopped"); return -EINVAL; } - if (enabled) { /* 1 */ + if (enabled) { /* true */ /* * Skip netpoll_parse_options() -- all the attributes are * already configured via configfs. Just print them out. @@ -340,13 +340,13 @@ static ssize_t store_enabled(struct netconsole_target *nt, return err; pr_info("netconsole: network logging started\n"); - } else { /* 0 */ + } else { /* false */ /* We need to disable the netconsole before cleaning it up * otherwise we might end up in write_msg() with - * nt->np.dev == NULL and nt->enabled == 1 + * nt->np.dev == NULL and nt->enabled == true */ spin_lock_irqsave(&target_list_lock, flags); - nt->enabled = 0; + nt->enabled = false; spin_unlock_irqrestore(&target_list_lock, flags); netpoll_cleanup(&nt->np); } @@ -594,7 +594,7 @@ static struct config_item *make_netconsole_target(struct config_group *group, /* * Allocate and initialize with defaults. - * Target is disabled at creation (enabled == 0). + * Target is disabled at creation (!enabled). */ nt = kzalloc(sizeof(*nt), GFP_KERNEL); if (!nt) @@ -695,7 +695,7 @@ restart: spin_lock_irqsave(&target_list_lock, flags); dev_put(nt->np.dev); nt->np.dev = NULL; - nt->enabled = 0; + nt->enabled = false; stopped = true; netconsole_target_put(nt); goto restart;