From patchwork Fri Jan 26 19:07:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Brandenburg X-Patchwork-Id: 10186847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7D6EB60383 for ; Fri, 26 Jan 2018 19:09:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F2FC29B1A for ; Fri, 26 Jan 2018 19:09:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61EC629D82; Fri, 26 Jan 2018 19:09:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4F7A29B1A for ; Fri, 26 Jan 2018 19:09:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752836AbeAZTHr (ORCPT ); Fri, 26 Jan 2018 14:07:47 -0500 Received: from mail-yw0-f193.google.com ([209.85.161.193]:33103 "EHLO mail-yw0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752828AbeAZTHp (ORCPT ); Fri, 26 Jan 2018 14:07:45 -0500 Received: by mail-yw0-f193.google.com with SMTP id x24so558428ywj.0 for ; Fri, 26 Jan 2018 11:07:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=omnibond-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kJ9NGWWCNud39hY827K7ivh2l73Kti+BHML/4veJwGE=; b=U/K02K0knylpza05sS09XkyWzey6qZZF0NJ6ZAQJi9vNXVXdRUpzHIdwyerxlNWxqm fJv2kf8AQBerNZzHubmdFk6izOJty5zU+HeYMnuYRavpscSACO/HPleSepznQP/UWYPU dXSYQtrNYdAxUcV4yfZFesdsg1ifImuDm+QEx4193HpgcMzNsw/NKT9b+G/FEsDJqWHd MLz09XgnmttxM3CGScN6O7CfqM8PXgHXsIKi+8sULs1N6NveKKtNhjzt+lPxav70ITKh 95lUW4UR/SwUNRSSnOMb6Q5mKckZtbBheo07aDMgoPJTUC862Uy5XHza5/SZCNCI34AC AyHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kJ9NGWWCNud39hY827K7ivh2l73Kti+BHML/4veJwGE=; b=TRA3r1IbGWF+c+Ni88wATjCg6WWr4BZn11zocKy1wM0QVeLaOsGoLTYxWf8Suc17IL pFhQg5YqrZKbUYfXedCbwyhWdgO0QtTapMTsKcqkbZuNdblGWZ1SpbB0fAeTyTLML96X h6l4YFWj8I/juxx6IL5/fa1ZGWDWY/u6AENzC0QzM2dCDD8r+/h2XCTnpghZBw5CW0Yu 0ZoZHaKmC+p9miH21hOkySRtgY1ogbeUECykHQ+kwjB9dt7sQs0OvVEORfiVcLlVnW6L fLA3M9/wILKSxaXFDRqRy17pLtfRZmD0Xo42z+8mDxwTkBDoNN0UZeV0YztGy2fHOzZT scpQ== X-Gm-Message-State: AKwxytcRgfgTaOGVpiqVbgHlLIY0QbyewNj3W0GDh0qbLDuG0kLJsP1R 6iJ5MDAwMc3Dt1KDhycoV7EVakqq X-Google-Smtp-Source: AH8x224jsSCZxemo5MSwhBQL4T4KX+dTgDPQU6Jsc1VRP2RFK7RpLy5jpz02aUaUqlFOTpTr9jyj3w== X-Received: by 10.129.98.65 with SMTP id w62mr11764066ywb.438.1516993664456; Fri, 26 Jan 2018 11:07:44 -0800 (PST) Received: from stumphouse.sysblue.org ([24.31.12.185]) by smtp.gmail.com with ESMTPSA id z30sm2283354ywj.15.2018.01.26.11.07.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jan 2018 11:07:43 -0800 (PST) From: Martin Brandenburg To: hubcap@omnibond.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, devel@lists.orangefs.org Cc: Martin Brandenburg Subject: [PATCH 2/7] orangefs: remove gossip_ldebug and gossip_lerr Date: Fri, 26 Jan 2018 14:07:12 -0500 Message-Id: <20180126190717.11075-3-martin@omnibond.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180126190717.11075-1-martin@omnibond.com> References: <20180126190717.11075-1-martin@omnibond.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP gossip_ldebug is unused. gossip_lerr is used in two places. The messages are unique so line numbers are unnecessary. Also remove support for compiling gossip messages out. It wasn't possible to enable it anyway. Signed-off-by: Martin Brandenburg --- fs/orangefs/orangefs-debugfs.c | 2 +- fs/orangefs/protocol.h | 15 --------------- fs/orangefs/super.c | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c index 67d531ad5a56..6e35f2f3c897 100644 --- a/fs/orangefs/orangefs-debugfs.c +++ b/fs/orangefs/orangefs-debugfs.c @@ -1056,7 +1056,7 @@ int orangefs_debugfs_new_debug(void __user *arg) client_debug_string, llu(mask_info.mask_value)); } else { - gossip_lerr("Invalid mask type....\n"); + gossip_err("Invalid mask type....\n"); return -EINVAL; } diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h index e0bf5e4dce0d..dc6e3e6269c3 100644 --- a/fs/orangefs/protocol.h +++ b/fs/orangefs/protocol.h @@ -395,13 +395,6 @@ struct ORANGEFS_dev_map_desc { /* gossip.h *****************************************************************/ -#ifdef GOSSIP_DISABLE_DEBUG -#define gossip_debug(mask, fmt, ...) \ -do { \ - if (0) \ - printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ -} while (0) -#else extern __u64 orangefs_gossip_debug_mask; /* try to avoid function call overhead by checking masks in macro */ @@ -410,13 +403,5 @@ do { \ if (orangefs_gossip_debug_mask & (mask)) \ printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ } while (0) -#endif /* GOSSIP_DISABLE_DEBUG */ - -/* do file and line number printouts w/ the GNU preprocessor */ -#define gossip_ldebug(mask, fmt, ...) \ - gossip_debug(mask, "%s: " fmt, __func__, ##__VA_ARGS__) #define gossip_err pr_err -#define gossip_lerr(fmt, ...) \ - gossip_err("%s line %d: " fmt, \ - __FILE__, __LINE__, ##__VA_ARGS__) diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index 36f1390b5ed7..a4f4b508eff2 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c @@ -335,7 +335,7 @@ static int orangefs_encode_fh(struct inode *inode, struct orangefs_object_kref refn; if (*max_len < len) { - gossip_lerr("fh buffer is too small for encoding\n"); + gossip_err("fh buffer is too small for encoding\n"); *max_len = len; type = 255; goto out;