From patchwork Mon Nov 17 21:58:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 5323861 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3C7849FD25 for ; Mon, 17 Nov 2014 21:58:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 49B8E200E1 for ; Mon, 17 Nov 2014 21:58:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53F3620125 for ; Mon, 17 Nov 2014 21:58:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752992AbaKQV6P (ORCPT ); Mon, 17 Nov 2014 16:58:15 -0500 Received: from mail-qg0-f47.google.com ([209.85.192.47]:62878 "EHLO mail-qg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752973AbaKQV6O (ORCPT ); Mon, 17 Nov 2014 16:58:14 -0500 Received: by mail-qg0-f47.google.com with SMTP id z60so3248426qgd.20 for ; Mon, 17 Nov 2014 13:58:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GQ+ixpihKOG1A8PUl5EdzC2lexMKXMmA6gnYOKalsSs=; b=TT9UvrgxvCAu00q0wE/Jor26u3h3v9wkOFleAgj09CwG2Px5PVwexGPIV33zAn/zTB J3ny0JGqaCEGcWPNZPzZhGxVb6nlDslZykIG6J8l5hTBLsRYSdYaWA4mTqFZ/0hjcYMf Yfxu9o/6eqr65myZgY1pj10zqb4fUk1j8zygVSKS+F/TAznI3V606uFsIDoRmGfFNyvA kqk15+53EdTAFWxf7mIu28vRUv4FnoOEFDo5Wahm57v9ybndLU8ES8SbzKZFxJK/MMB9 TvYNzFstQ+cxw62QlL3zi3qrmT8dHVLZLAoVxuGiTlPzN9hv0Nmwg+mBSpbC0WrB9uJg Rfjg== X-Gm-Message-State: ALoCoQma227SK87booCgJ7VlSWOLqR5iUM0uuynJOoy5tOzp6LTo+DkQEJeiWTzwH/oCSt5QV2/+ X-Received: by 10.229.105.196 with SMTP id u4mr37669505qco.27.1416261493330; Mon, 17 Nov 2014 13:58:13 -0800 (PST) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id c88sm2679698qgc.6.2014.11.17.13.58.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Nov 2014 13:58:12 -0800 (PST) From: Jeff Layton To: trond.myklebust@primarydata.com Cc: bfields@fieldses.org, linux-nfs@vger.kernel.org Subject: [PATCH 1/3] lockd: eliminate LOCKD_DEBUG Date: Mon, 17 Nov 2014 16:58:03 -0500 Message-Id: <1416261485-24686-2-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1416261485-24686-1-git-send-email-jlayton@primarydata.com> References: <1416261485-24686-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 LOCKD_DEBUG is always the same value as CONFIG_SUNRPC_DEBUG, so we can just use it instead. Signed-off-by: Jeff Layton --- fs/lockd/svclock.c | 2 +- include/linux/lockd/debug.h | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 13db95f54176..56598742dde4 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -53,7 +53,7 @@ static const struct rpc_call_ops nlmsvc_grant_ops; static LIST_HEAD(nlm_blocked); static DEFINE_SPINLOCK(nlm_blocked_lock); -#ifdef LOCKD_DEBUG +#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie) { /* diff --git a/include/linux/lockd/debug.h b/include/linux/lockd/debug.h index 257d3779f2ab..0ca8109934e4 100644 --- a/include/linux/lockd/debug.h +++ b/include/linux/lockd/debug.h @@ -17,12 +17,8 @@ * Enable lockd debugging. * Requires RPC_DEBUG. */ -#ifdef RPC_DEBUG -# define LOCKD_DEBUG 1 -#endif - #undef ifdebug -#if defined(RPC_DEBUG) && defined(LOCKD_DEBUG) +#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) # define ifdebug(flag) if (unlikely(nlm_debug & NLMDBG_##flag)) #else # define ifdebug(flag) if (0)