From patchwork Wed Nov 26 19:44:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 5387661 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 474A8C11AC for ; Wed, 26 Nov 2014 19:44:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80A6D201FB for ; Wed, 26 Nov 2014 19:44:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B8D5201F4 for ; Wed, 26 Nov 2014 19:44:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750812AbaKZToy (ORCPT ); Wed, 26 Nov 2014 14:44:54 -0500 Received: from mail-qg0-f48.google.com ([209.85.192.48]:51345 "EHLO mail-qg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750870AbaKZToy (ORCPT ); Wed, 26 Nov 2014 14:44:54 -0500 Received: by mail-qg0-f48.google.com with SMTP id q107so2525548qgd.7 for ; Wed, 26 Nov 2014 11:44:53 -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=NEzWXtL6lGf+aHnTKju34BdIAz2cf4e4ed4Hv/IjCSNBbA0UqcAmSZdHGhCRozSpS1 c9mH1T8Nb2PrgjwY9jcRCurYRIn1thiYlaDMTNapN+FEqWAJ206xVODHt1yq2wEFmuaW 7QE49iMaKJtsRHAytpJl9DHygdcIUHGGKO/9how9NJAURYLi6VezafVDRvRZ3JWHoQmo 4BhWi6UdTA7rAoCoKZohnyfwMMrwesCUqDWtNuwdDvOwQLSo98sSApLHO4SmnOKA5+0n vsDUuNwPCRdVRch4kNEAkRKEdrcRv2rhE9lLprXCgCejA/BjyJtvxbZSDsUAQGFZHNyC c+Rg== X-Gm-Message-State: ALoCoQnx/P6gt0JW0FRNFQCdr5Zxn6V2dFAQkXhHdiIS7wDBqFqZE2EZKXy+vP5eiLVjLIXvKAOR X-Received: by 10.140.38.170 with SMTP id t39mr9803409qgt.15.1417031093408; Wed, 26 Nov 2014 11:44:53 -0800 (PST) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id f3sm4691349qag.49.2014.11.26.11.44.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Nov 2014 11:44:52 -0800 (PST) From: Jeff Layton To: trond.myklebust@primarydata.com Cc: Anna Schumaker , bfields@fieldses.org, linux-nfs@vger.kernel.org Subject: [PATCH v3 1/5] lockd: eliminate LOCKD_DEBUG Date: Wed, 26 Nov 2014 14:44:40 -0500 Message-Id: <1417031084-17576-2-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417031084-17576-1-git-send-email-jlayton@primarydata.com> References: <1416942060-6724-1-git-send-email-jlayton@primarydata.com> <1417031084-17576-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)