From patchwork Mon Jun 30 15:49:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4451761 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 AA14EBEEAA for ; Mon, 30 Jun 2014 15:52:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CBD7120225 for ; Mon, 30 Jun 2014 15:52:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E53412021F for ; Mon, 30 Jun 2014 15:52:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754783AbaF3PwN (ORCPT ); Mon, 30 Jun 2014 11:52:13 -0400 Received: from mail-qg0-f53.google.com ([209.85.192.53]:39134 "EHLO mail-qg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752643AbaF3PwM (ORCPT ); Mon, 30 Jun 2014 11:52:12 -0400 Received: by mail-qg0-f53.google.com with SMTP id i50so2178935qgf.12 for ; Mon, 30 Jun 2014 08:52:12 -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=bhlOtu2il6HoEyMJnbAxPyHBLHTZQf2uevKu7zZMjvw=; b=SsGZCEp/sNEXbWyhlYJX+JArYc6qsKu+zm6Efn6KXLRPPw11Iu0uIMjZ3HawEbcCfy 2DgTJj9jj3lieezs7M/f7hb2lARXAVz2ln14rm4Bfxm/qQTht+SLFDONyBVR0ecnecMr 2iA0zGGjq0heBFHcQtKx1MgMsZReSUsKBc6/b7XDOu3C8Uqzgd4Rp+9vIICAZlnvXVwj jLmD4MTgrvSTxYsgzLxBmKf8DjZux8Upb6Vqt/FNAkRcQMYeM8YS40Ew3SzESKKzH6J7 hd8Jim9i4khUtCdnV8WM8rTkKEGj42fbOFBqHIeJQ3wNGJvE9QuV28gCa0oW3tJ0i2Tx b21A== X-Gm-Message-State: ALoCoQln5o8U1uBTSmhS2grr3r4TYE+BvSC0YMSF92tAi2Z8auPrCiSnd2xAKLDlOvPszVkO0708 X-Received: by 10.224.22.12 with SMTP id l12mr63476294qab.88.1404143532010; Mon, 30 Jun 2014 08:52:12 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id m1sm32584105qaz.27.2014.06.30.08.52.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jun 2014 08:52:10 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 070/114] nfsd: clean up and reorganize release_lockowner Date: Mon, 30 Jun 2014 11:49:39 -0400 Message-Id: <1404143423-24381-71-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404143423-24381-1-git-send-email-jlayton@primarydata.com> References: <1404143423-24381-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 Do more within the main loop, and simplify the function a bit. Also, there's no need to take a stateowner reference unless we're going to call release_lockowner. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 49 ++++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 1bd7b2b0a4b1..4f82e502f53a 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5359,8 +5359,8 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, struct nfsd4_release_lockowner *rlockowner) { clientid_t *clid = &rlockowner->rl_clientid; - struct nfs4_stateowner *sop = NULL, *tmp; - struct nfs4_lockowner *lo; + struct nfs4_stateowner *sop; + struct nfs4_lockowner *lo = NULL; struct nfs4_ol_stateid *stp; struct xdr_netobj *owner = &rlockowner->rl_owner; unsigned int hashval = ownerstr_hashval(owner); @@ -5377,45 +5377,32 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, if (status) goto out; - status = nfserr_locks_held; - clp = cstate->clp; /* Find the matching lock stateowner */ spin_lock(&clp->cl_lock); - list_for_each_entry(tmp, &clp->cl_ownerstr_hashtbl[hashval], + list_for_each_entry(sop, &clp->cl_ownerstr_hashtbl[hashval], so_strhash) { - if (tmp->so_is_open_owner) - continue; - if (same_owner_str(tmp, owner)) { - sop = tmp; - atomic_inc(&sop->so_count); - break; - } - } - /* No matching owner found, maybe a replay? Just declare victory... */ - if (!sop) { - spin_unlock(&clp->cl_lock); - status = nfs_ok; - goto out; - } + if (sop->so_is_open_owner || !same_owner_str(sop, owner)) + continue; - lo = lockowner(sop); - /* see if there are still any locks associated with it */ - list_for_each_entry(stp, &sop->so_stateids, st_perstateowner) { - if (check_for_locks(stp->st_stid.sc_file, lo)) { - spin_unlock(&clp->cl_lock); - goto out; + /* see if there are still any locks associated with it */ + lo = lockowner(sop); + list_for_each_entry(stp, &sop->so_stateids, st_perstateowner) { + if (check_for_locks(stp->st_stid.sc_file, lo)) { + status = nfserr_locks_held; + spin_unlock(&clp->cl_lock); + goto out; + } } + + atomic_inc(&sop->so_count); + break; } spin_unlock(&clp->cl_lock); - - status = nfs_ok; - sop = NULL; - release_lockowner(lo); + if (lo) + release_lockowner(lo); out: - if (sop) - nfs4_put_stateowner(sop); nfs4_unlock_state(); return status; }