From patchwork Mon Jan 5 19:17:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 5570231 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1679C9F2ED for ; Mon, 5 Jan 2015 19:17:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35C5F201BC for ; Mon, 5 Jan 2015 19:17:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27591201EC for ; Mon, 5 Jan 2015 19:17:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754234AbbAETRa (ORCPT ); Mon, 5 Jan 2015 14:17:30 -0500 Received: from mx11.netapp.com ([216.240.18.76]:20552 "EHLO mx11.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753780AbbAETRa (ORCPT ); Mon, 5 Jan 2015 14:17:30 -0500 X-IronPort-AV: E=Sophos;i="5.07,701,1413270000"; d="scan'208";a="182102170" Received: from vmwexchts02-prd.hq.netapp.com ([10.122.105.23]) by mx11-out.netapp.com with ESMTP; 05 Jan 2015 11:17:30 -0800 Received: from smtp1.corp.netapp.com (10.57.156.124) by VMWEXCHTS02-PRD.hq.netapp.com (10.122.105.23) with Microsoft SMTP Server id 15.0.995.29; Mon, 5 Jan 2015 11:17:29 -0800 Received: from davros.com ([10.63.227.206]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id t05JHQdO019565; Mon, 5 Jan 2015 11:17:28 -0800 (PST) From: Anna Schumaker To: , Subject: [PATCH 3/3] nfs: Remove unused v4 macros Date: Mon, 5 Jan 2015 14:17:24 -0500 Message-ID: <1420485444-20101-4-git-send-email-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1420485444-20101-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1420485444-20101-1-git-send-email-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 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=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 These functions are never called in the case that NFS v4 is not enabled. Signed-off-by: Anna Schumaker --- fs/nfs/nfs4_fs.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 3694895..f39314b 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -509,10 +509,5 @@ static inline bool nfs4_valid_open_stateid(const struct nfs4_state *state) return test_bit(NFS_STATE_RECOVERY_FAILED, &state->flags) == 0; } -#else - -#define nfs4_close_state(a, b) do { } while (0) -#define nfs4_close_sync(a, b) do { } while (0) - #endif /* CONFIG_NFS_V4 */ #endif /* __LINUX_FS_NFS_NFS4_FS.H */