From patchwork Mon Jun 30 15:49:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4451491 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 9D650BEECB for ; Mon, 30 Jun 2014 15:51:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C29942021A for ; Mon, 30 Jun 2014 15:51:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1555201C0 for ; Mon, 30 Jun 2014 15:51:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754428AbaF3Pvd (ORCPT ); Mon, 30 Jun 2014 11:51:33 -0400 Received: from mail-qg0-f46.google.com ([209.85.192.46]:46446 "EHLO mail-qg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750897AbaF3Pvc (ORCPT ); Mon, 30 Jun 2014 11:51:32 -0400 Received: by mail-qg0-f46.google.com with SMTP id q107so2116339qgd.5 for ; Mon, 30 Jun 2014 08:51:31 -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=RPQCOn81nmEqxmVi57AClGOf6MaIt1A4ccU+aE7KlYw=; b=T2VqRaPMh0S4YnHP5Fmgsr6HhV2VEjaDLq0BUQgB+mOMCoAdD9nyAH1WYkq8je1ohl Er0thT5l9l/mqeLFBRf/pCEsTAsVgjvXIWmXezQouRJxoW72PWk/uoQF0kpS+KJQ0eTn NztpXI3OOIQFQQVSE5jmopyRIigRhvUp50nvDfK6qTVRwY6iVHfP+3epz7stuA/kuR6P tzhDT9NpooXQFvaJeFUg+IpWMqSW/QKsnI+Bcz6fuwltO56am/It7yClbTTxjb6XXgJ4 iR//Fuggi0iG2LKZC5MBtgBGN/3GBeUI/B3JOA9C1FIeka7ACiTYWKoZGtJ3pGD0H7S9 5RQQ== X-Gm-Message-State: ALoCoQli4f8GMPoJkahdVUZ8sx0h0uCMORYACPixhHnEmEOkGSW7V2BW1P6DOeOvBsAUrtwMgCZ6 X-Received: by 10.224.3.201 with SMTP id 9mr61361224qao.73.1404143491879; Mon, 30 Jun 2014 08:51:31 -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.51.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jun 2014 08:51:31 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 042/114] nfsd: do filp_close in sc_free callback for lock stateids Date: Mon, 30 Jun 2014 11:49:11 -0400 Message-Id: <1404143423-24381-43-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 Releasing locks when we unhash the stateid instead of doing so only when the stateid is actually released is problematic and will complicate some later changes. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ed3df2cdd025..aea256264266 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -877,6 +877,18 @@ static void nfs4_free_generic_stateid(struct nfs4_stid *stid) nfs4_free_stid(stateid_slab, stid); } +static void nfs4_free_lock_stateid(struct nfs4_stid *stid) +{ + struct nfs4_ol_stateid *stp = openlockstateid(stid); + struct nfs4_lockowner *lo = lockowner(stp->st_stateowner); + struct file *file; + + file = find_any_file(stp->st_stid.sc_file); + if (file) + filp_close(file, (fl_owner_t)lo); + nfs4_free_generic_stateid(stid); +} + static void put_generic_stateid(struct nfs4_ol_stateid *stp) { nfs4_put_stid(&stp->st_stid); @@ -884,14 +896,9 @@ static void put_generic_stateid(struct nfs4_ol_stateid *stp) static void __release_lock_stateid(struct nfs4_ol_stateid *stp) { - struct file *file; - list_del(&stp->st_locks); unhash_generic_stateid(stp); unhash_stid(&stp->st_stid); - file = find_any_file(stp->st_stid.sc_file); - if (file) - filp_close(file, (fl_owner_t)lockowner(stp->st_stateowner)); put_generic_stateid(stp); } @@ -4645,6 +4652,7 @@ alloc_init_lock_stateid(struct nfs4_lockowner *lo, struct nfs4_file *fp, struct stp->st_stateowner = &lo->lo_owner; get_nfs4_file(fp); stp->st_stid.sc_file = fp; + stp->st_stid.sc_free = nfs4_free_lock_stateid; stp->st_access_bmap = 0; stp->st_deny_bmap = open_stp->st_deny_bmap; stp->st_openstp = open_stp;