From patchwork Thu Sep 26 14:45:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 2948451 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 05C83BFF0B for ; Thu, 26 Sep 2013 14:46:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 669D2201F9 for ; Thu, 26 Sep 2013 14:46:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C8F9201FA for ; Thu, 26 Sep 2013 14:46:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752958Ab3IZOpm (ORCPT ); Thu, 26 Sep 2013 10:45:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51917 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752987Ab3IZOpk (ORCPT ); Thu, 26 Sep 2013 10:45:40 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8QEjYrx015327 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 26 Sep 2013 10:45:35 -0400 Received: from warthog.procyon.org.uk (ovpn-113-111.phx2.redhat.com [10.3.113.111]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r8QEjX5e007902; Thu, 26 Sep 2013 10:45:33 -0400 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 4/4] SunRPC: Kill RPC_IFDEBUG() and NFS_IFDEBUG() To: bfields@fieldses.org, Trond.Myklebust@netapp.com From: David Howells Cc: olof@lixom.net, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Date: Thu, 26 Sep 2013 15:45:32 +0100 Message-ID: <20130926144532.29424.54343.stgit@warthog.procyon.org.uk> In-Reply-To: <20130926144502.29424.21633.stgit@warthog.procyon.org.uk> References: <20130926144502.29424.21633.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Kill RPC_IFDEBUG() and NFS_IFDEBUG() as they're no longer used. Signed-off-by: David Howells --- include/linux/nfs_fs.h | 2 -- include/linux/sunrpc/debug.h | 2 -- 2 files changed, 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 3ea4cde..e0e95e2 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -623,9 +623,7 @@ nfs_fileid_to_ino_t(u64 fileid) # undef ifdebug # ifdef NFS_DEBUG # define ifdebug(fac) if (unlikely(nfs_debug & NFSDBG_##fac)) -# define NFS_IFDEBUG(x) x # else # define ifdebug(fac) if (0) -# define NFS_IFDEBUG(x) # endif #endif diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h index 60116cb..fd79089 100644 --- a/include/linux/sunrpc/debug.h +++ b/include/linux/sunrpc/debug.h @@ -39,11 +39,9 @@ extern unsigned int nlm_debug; #ifdef RPC_DEBUG # define ifdebug(fac) if (unlikely(rpc_debug & RPCDBG_##fac)) # define __dprintk(fmt, ...) printk(KERN_DEFAULT fmt, ##__VA_ARGS__); -# define RPC_IFDEBUG(x) x #else # define ifdebug(fac) if (0) # define __dprintk(fmt, ...) no_printk(KERN_DEFAULT fmt, ##__VA_ARGS__); -# define RPC_IFDEBUG(x) #endif #define dfprintk(fac, fmt, ...) \