From patchwork Fri Apr 18 18:44:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 4017611 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 62357BFF02 for ; Fri, 18 Apr 2014 18:45:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 89B63203AF for ; Fri, 18 Apr 2014 18:45:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A85A6203AC for ; Fri, 18 Apr 2014 18:45:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754159AbaDRSpi (ORCPT ); Fri, 18 Apr 2014 14:45:38 -0400 Received: from mail-ie0-f182.google.com ([209.85.223.182]:53301 "EHLO mail-ie0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753153AbaDRSpU (ORCPT ); Fri, 18 Apr 2014 14:45:20 -0400 Received: by mail-ie0-f182.google.com with SMTP id y20so1904337ier.13 for ; Fri, 18 Apr 2014 11:45:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=46ckHcbJF6IMheuAqdLpPcE9/ktaovLb1MYuYFgR0rE=; b=Ou6jSi5EmAkW63qNHojbISpJ4aPJfwS65L+TQuRkmOdSyn7+vVfHbc2fiemSmLmNch 5zlx3s6SPZ+kIQoP9Nnw4mb4fZXqVS7aDRb3wqZwd6m7XbteVMNGulerAD4sZUPmPRpa 0M1rusEyi96jDDgrC6+/jQE/QZJ40Lv6MvLRqAUrpOp/97MZ5f503xAa0wOBbD9BTnEg NVJDk7pvHLveQcib2+un7IEbSxV9JqKtUA9DY405d+mCGVI6Rm0QajYmFbnMn0wX8JfK tRKC8L13uLzYlYNC/McexcheUkV4KrrWJPmjSWXxQjwPwvbtdZ5bfrsnUrf05DjVLF+x EFNw== X-Gm-Message-State: ALoCoQn7W38N4zNYtB05Oyu/SPXfaJpBHuSSGNo7N86VSV9cTmgDuq6qReTvKQ9/SfLJJeu8oABp X-Received: by 10.50.112.202 with SMTP id is10mr5832438igb.7.1397846719092; Fri, 18 Apr 2014 11:45:19 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-124-5-70.drr02.mskg.mi.frontiernet.net. [50.124.5.70]) by mx.google.com with ESMTPSA id j9sm6018922igu.10.2014.04.18.11.45.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Apr 2014 11:45:17 -0700 (PDT) From: Trond Myklebust To: Bruce Fields Cc: linux-nfs@vger.kernel.org Subject: [PATCH 09/70] NFSd: Mark nfs4_free_lockowner and nfs4_free_openowner as static functions Date: Fri, 18 Apr 2014 14:44:03 -0400 Message-Id: <1397846704-14567-10-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1397846704-14567-9-git-send-email-trond.myklebust@primarydata.com> References: <1397846704-14567-1-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-2-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-3-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-4-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-5-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-6-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-7-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-8-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-9-git-send-email-trond.myklebust@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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 They do not need to be used outside fs/nfsd/nfs4state.c Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 24 ++++++++++++------------ fs/nfsd/state.h | 2 -- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 45c4b692e30d..6d691aa2bb27 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -659,6 +659,12 @@ static void unhash_lockowner(struct nfs4_lockowner *lo) } } +static void nfs4_free_lockowner(struct nfs4_lockowner *lo) +{ + kfree(lo->lo_owner.so_owner.data); + kmem_cache_free(lockowner_slab, lo); +} + static void release_lockowner(struct nfs4_lockowner *lo) { unhash_lockowner(lo); @@ -713,6 +719,12 @@ static void release_last_closed_stateid(struct nfs4_openowner *oo) } } +static void nfs4_free_openowner(struct nfs4_openowner *oo) +{ + kfree(oo->oo_owner.so_owner.data); + kmem_cache_free(openowner_slab, oo); +} + static void release_openowner(struct nfs4_openowner *oo) { unhash_openowner(oo); @@ -2571,18 +2583,6 @@ out_nomem: return -ENOMEM; } -void nfs4_free_openowner(struct nfs4_openowner *oo) -{ - kfree(oo->oo_owner.so_owner.data); - kmem_cache_free(openowner_slab, oo); -} - -void nfs4_free_lockowner(struct nfs4_lockowner *lo) -{ - kfree(lo->lo_owner.so_owner.data); - kmem_cache_free(lockowner_slab, lo); -} - static void init_nfs4_replay(struct nfs4_replay *rp) { rp->rp_status = nfserr_serverfault; diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 424d8f5f2317..1aa22f39fc65 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -464,8 +464,6 @@ extern void nfs4_release_reclaim(struct nfsd_net *); extern struct nfs4_client_reclaim *nfsd4_find_reclaim_client(const char *recdir, struct nfsd_net *nn); extern __be32 nfs4_check_open_reclaim(clientid_t *clid, bool sessions, struct nfsd_net *nn); -extern void nfs4_free_openowner(struct nfs4_openowner *); -extern void nfs4_free_lockowner(struct nfs4_lockowner *); extern int set_callback_cred(void); extern void nfsd4_init_callback(struct nfsd4_callback *); extern void nfsd4_probe_callback(struct nfs4_client *clp);