From patchwork Tue Apr 8 05:06:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 3947781 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 7D182BFF02 for ; Tue, 8 Apr 2014 05:06:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A46832025A for ; Tue, 8 Apr 2014 05:06:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C446E2022A for ; Tue, 8 Apr 2014 05:06:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750904AbaDHFGs (ORCPT ); Tue, 8 Apr 2014 01:06:48 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:49464 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750789AbaDHFGr (ORCPT ); Tue, 8 Apr 2014 01:06:47 -0400 Received: by mail-pd0-f169.google.com with SMTP id fp1so482458pdb.28 for ; Mon, 07 Apr 2014 22:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=QUQnIRM8jHTZkje71SQ807/b7C6Kx3P3q5+azns8PeE=; b=Q5rfgeJTMYHQ1sDfSR1XMzjd+r2IabMpgSFL1dq/1ZRV7X6ZT8qBa2yw1lW9TRU5UZ Q/H98W1BXViXRJJEaxSmKWklYMC1zNHxSRu3BS1rY7yWRnJinEIbJZOcuAqqbn/ADwNu Yu9T2hB0a43LOy8qVSsu+j6Pl0E+6nlGJA/m5ZdgChfBoMnOUoAvDL80+c4D4XjFWPPW Ik5DLtEu/Xx7S+3NOdUlEhN5jENYCutmm12AYcc7EbqtjcfVHIoIjesdNSmqiL0HUKtT ihYj3wke49F5RlAM0gLbKD8CYHtqXu/d+IC6aI/YVd3CN/7l/rJSTmUfH4urahbu0hpZ n5DQ== X-Received: by 10.68.184.66 with SMTP id es2mr1888744pbc.19.1396933606986; Mon, 07 Apr 2014 22:06:46 -0700 (PDT) Received: from [192.168.0.104] ([118.117.108.102]) by mx.google.com with ESMTPSA id gj9sm1706667pbc.7.2014.04.07.22.06.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Apr 2014 22:06:46 -0700 (PDT) Message-ID: <534383D4.50504@gmail.com> Date: Tue, 08 Apr 2014 13:06:28 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: "J. Bruce Fields" , linux-nfs@vger.kernel.org Subject: [PATCH] NFSD: Get rid of empty function nfs4_state_init Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Signed-off-by: Kinglong Mee --- fs/nfsd/nfs4state.c | 7 ------- fs/nfsd/nfsctl.c | 1 - fs/nfsd/nfsd.h | 2 -- 3 files changed, 10 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5a9588e..6e786a8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4969,13 +4969,6 @@ struct nfs4_client *nfsd_find_client(struct sockaddr_storage *addr, size_t addr_ #endif /* CONFIG_NFSD_FAULT_INJECTION */ -/* initialization to perform at module load time: */ - -void -nfs4_state_init(void) -{ -} - /* * Since the lifetime of a delegation isn't limited to that of an open, a * client may quite reasonably hang on to a delegation as long as it has diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 7f55517..493f3d4 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1174,7 +1174,6 @@ static int __init init_nfsd(void) retval = nfsd4_init_slabs(); if (retval) goto out_unregister_pernet; - nfs4_state_init(); retval = nfsd_fault_inject_init(); /* nfsd fault injection controls */ if (retval) goto out_free_slabs; diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 30f34ab..22259f8 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -106,7 +106,6 @@ static inline int nfsd_v4client(struct svc_rqst *rq) */ #ifdef CONFIG_NFSD_V4 extern unsigned long max_delegations; -void nfs4_state_init(void); int nfsd4_init_slabs(void); void nfsd4_free_slabs(void); int nfs4_state_start(void); @@ -117,7 +116,6 @@ void nfs4_reset_lease(time_t leasetime); int nfs4_reset_recoverydir(char *recdir); char * nfs4_recoverydir(void); #else -static inline void nfs4_state_init(void) { } static inline int nfsd4_init_slabs(void) { return 0; } static inline void nfsd4_free_slabs(void) { } static inline int nfs4_state_start(void) { return 0; }