From patchwork Wed Jul 30 01:34:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4644331 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 281D8C0338 for ; Wed, 30 Jul 2014 01:35:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CA662012D for ; Wed, 30 Jul 2014 01:35:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93BF92012B for ; Wed, 30 Jul 2014 01:35:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754751AbaG3Bfs (ORCPT ); Tue, 29 Jul 2014 21:35:48 -0400 Received: from mail-qg0-f53.google.com ([209.85.192.53]:61192 "EHLO mail-qg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754725AbaG3Bfr (ORCPT ); Tue, 29 Jul 2014 21:35:47 -0400 Received: by mail-qg0-f53.google.com with SMTP id q107so656363qgd.40 for ; Tue, 29 Jul 2014 18:35:47 -0700 (PDT) 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=qXohWfW3KsbkTjL9xUGd60fkshwYPh6xAe6yqWzltgg=; b=GRFOnDgUGwisRD+xD8f85KViGwNvkQmKyEuBeWk/V3JRAD5oIUaOGqcAfUsQcoUZ4P 6XhB16lme5zLFLldap72kw73oNUGDAFvPn6plibil2LMFlSpTiD6wF4MsrRHQuQnDzIQ bqLgc8OySHbtW/S4wpXXR2K0H9NTjXAOqCbfpwdiY0CdUJfPlhsRhzRE1J4Rs4WvymGZ 2H3rMTwaOrblnCOo3h0E4TZQ2O05EgfincGPYN+cyRMQnJIet9y5HJtUonul94B1KhfB hRA7ScgBz87wZxB5L8628ojsHq5nuPixtnVh7F8sKmaYFrlAmdWBUqmaqveVZHRhKUji 6pow== X-Gm-Message-State: ALoCoQmQxbafRmAKVh05VzrlLopfwCsA6OKKHmg3Ag6YbMAfTiAumWxfrnk1XnkobXCKalAvsoTr X-Received: by 10.140.50.50 with SMTP id r47mr1199250qga.96.1406684147151; Tue, 29 Jul 2014 18:35:47 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id 81sm860946qgw.21.2014.07.29.18.35.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jul 2014 18:35:46 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org Subject: [PATCH v3 38/38] nfsd: rename unhash_generic_stateid to unhash_ol_stateid Date: Tue, 29 Jul 2014 21:34:43 -0400 Message-Id: <1406684083-19736-39-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406684083-19736-1-git-send-email-jlayton@primarydata.com> References: <1406684083-19736-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=-7.6 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 ...to better match other functions that deal with open/lock stateids. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 1f67a96c4941..52ec47de1185 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -949,7 +949,7 @@ static void nfs4_put_stateowner(struct nfs4_stateowner *sop) sop->so_ops->so_free(sop); } -static void unhash_generic_stateid(struct nfs4_ol_stateid *stp) +static void unhash_ol_stateid(struct nfs4_ol_stateid *stp) { struct nfs4_file *fp = stp->st_stid.sc_file; @@ -1014,7 +1014,7 @@ static void unhash_lock_stateid(struct nfs4_ol_stateid *stp) lockdep_assert_held(&oo->oo_owner.so_client->cl_lock); list_del_init(&stp->st_locks); - unhash_generic_stateid(stp); + unhash_ol_stateid(stp); unhash_stid(&stp->st_stid); } @@ -1095,7 +1095,7 @@ static void unhash_open_stateid(struct nfs4_ol_stateid *stp, { lockdep_assert_held(&stp->st_stid.sc_client->cl_lock); - unhash_generic_stateid(stp); + unhash_ol_stateid(stp); release_open_stateid_locks(stp, reaplist); }