From patchwork Thu Jun 19 14:49:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4383861 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1C9AC9F1D6 for ; Thu, 19 Jun 2014 14:51:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28F3120384 for ; Thu, 19 Jun 2014 14:51:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B6722038F for ; Thu, 19 Jun 2014 14:51:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757905AbaFSOvo (ORCPT ); Thu, 19 Jun 2014 10:51:44 -0400 Received: from mail-qc0-f169.google.com ([209.85.216.169]:50057 "EHLO mail-qc0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757959AbaFSOvn (ORCPT ); Thu, 19 Jun 2014 10:51:43 -0400 Received: by mail-qc0-f169.google.com with SMTP id c9so2286132qcz.28 for ; Thu, 19 Jun 2014 07:51:43 -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=9TcFFV10eMczZp3+T4thxDl8nXxzNdNAa9cRb6A/1rY=; b=JXuusa1ZKAYCIu+ZLawsQKP/PC6iWu9KEXB0fSMUByAXiPEIognJjrJYubfvqiNO1r FMNpMy0lUwatTuZB21jvRXqdFkafJqUZX8en/ddpZ641ngXhI8fsiujHt4dsCKzdj1Ml 60AG+YBr6NaiPrDHFJiyXy9tIjXB0wAKB9SUF5faXbHd+0CSC58iByZxZ7cQjEaqpDzz wZTxFVUIkEJyr2JOmmAATN5myLZSZNzmxznXRktEFNKcC8bz7w2BbRm/e2nJ3B3wnH3g qnBsiHVIvGET70Mft+SHmzvDxgCqWq1xTDeNi7nH12SpInga5mPZUEkSPc7XkcJ9N/Ae 2SZQ== X-Gm-Message-State: ALoCoQlbI2eV5Uzu2rNqOF6P4IUKPmCbf47x5vlVdAQnkyEb8YQdjpDSjNH8ViV+NKiGsju7XCT6 X-Received: by 10.224.49.131 with SMTP id v3mr7978387qaf.70.1403189503176; Thu, 19 Jun 2014 07:51:43 -0700 (PDT) Received: from tlielax.poochiereds.net (cpe-107-015-124-230.nc.res.rr.com. [107.15.124.230]) by mx.google.com with ESMTPSA id r60sm3364044qgd.26.2014.06.19.07.51.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:51:41 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 032/104] NFSd: Slight cleanup of find_stateid() Date: Thu, 19 Jun 2014 10:49:38 -0400 Message-Id: <1403189450-18729-33-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403189450-18729-1-git-send-email-jlayton@primarydata.com> References: <1403189450-18729-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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 From: Trond Myklebust In preparation of reference counting... Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 020bc981ccd3..42ef5ecc1def 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1561,28 +1561,36 @@ static void gen_confirm(struct nfs4_client *clp) memcpy(clp->cl_confirm.data, verf, sizeof(clp->cl_confirm.data)); } -static struct nfs4_stid *find_stateid(struct nfs4_client *cl, stateid_t *t) +static struct nfs4_stid *find_stateid_locked(struct nfs4_client *cl, stateid_t *t) { struct nfs4_stid *ret; - spin_lock(&cl->cl_lock); ret = idr_find(&cl->cl_stateids, t->si_opaque.so_id); - spin_unlock(&cl->cl_lock); if (!ret || !ret->sc_type) return NULL; return ret; } +static struct nfs4_stid *find_stateid(struct nfs4_client *cl, stateid_t *t) +{ + struct nfs4_stid *ret; + + spin_lock(&cl->cl_lock); + ret = find_stateid_locked(cl, t); + spin_unlock(&cl->cl_lock); + return ret; +} + static struct nfs4_stid *find_stateid_by_type(struct nfs4_client *cl, stateid_t *t, char typemask) { struct nfs4_stid *s; - s = find_stateid(cl, t); - if (!s) - return NULL; - if (typemask & s->sc_type) - return s; - return NULL; + spin_lock(&cl->cl_lock); + s = find_stateid_locked(cl, t); + if (s != NULL && !(typemask & s->sc_type)) + s = NULL; + spin_unlock(&cl->cl_lock); + return s; } static struct nfs4_client *create_client(struct xdr_netobj name,