From patchwork Thu Jul 17 19:12:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4578361 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 92F749F43D for ; Thu, 17 Jul 2014 19:12:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 876A4201C0 for ; Thu, 17 Jul 2014 19:12:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92B2A2018E for ; Thu, 17 Jul 2014 19:12:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755112AbaGQTMr (ORCPT ); Thu, 17 Jul 2014 15:12:47 -0400 Received: from mail-qc0-f173.google.com ([209.85.216.173]:64110 "EHLO mail-qc0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754957AbaGQTMq (ORCPT ); Thu, 17 Jul 2014 15:12:46 -0400 Received: by mail-qc0-f173.google.com with SMTP id c9so2481513qcz.18 for ; Thu, 17 Jul 2014 12:12:45 -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=XS/06csVMQZDL3EJdgSg/w4raTXd1P9rirpaTyfGpoQ=; b=B5FA3aVTczOCYFuVF0+ZqxuvOguEKqerpbRbb8TeNRtwX3PqyvNNIn51zZZxb1K0/J tzILzOT6jZpm+QGpglAdXOKppy4yXkVyLT+kWxg5c5fsM+TnzSeFlcITKg9mgsX45Kew 94otWUJf45Zx/+Rmd8VepH6EWYuiE8yTWVAWjRi01NYxzMVwAreV/KEB/QCvId4Wjtrq yW7JvpjeB+CCp0c02cNt9VbFvvB2YqpmNBjteX1oc4WtKqq7lUrHmbJsBMuiYbakuSNB 4+92LGh6bgFhlFVMEtBu840LxWRNeQBJ97FXqHSRJPn/TT2ywiAJxYD1SJLOPhbbN9+B 5k9A== X-Gm-Message-State: ALoCoQmbAUFvmculCP1K1ywlL9s0WdXPwOnpeP49RhwNWAsn/Hn9g/HNrMQMZSfO10WZrYF0S1Jk X-Received: by 10.140.49.76 with SMTP id p70mr58548129qga.86.1405624365897; Thu, 17 Jul 2014 12:12:45 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id 98sm3678250qgh.5.2014.07.17.12.12.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jul 2014 12:12:45 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: hch@infradead.org, linux-nfs@vger.kernel.org Subject: [PATCH 3/6] nfsd: simplify stateid allocation and file handling Date: Thu, 17 Jul 2014 15:12:31 -0400 Message-Id: <1405624354-22388-4-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405624354-22388-1-git-send-email-jlayton@primarydata.com> References: <1405624354-22388-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, 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 Don't allow stateids to clear the open file pointer until they are being destroyed. In a later patch we'll want to move the putting of the nfs4_file into generic stateid handling code. Also, move to kzalloc and get rid of explicit zeroing of fields. Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index d88a33fa8e8f..c06a08711e7f 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -459,7 +459,7 @@ kmem_cache *slab) struct nfs4_stid *stid; int new_id; - stid = kmem_cache_alloc(slab, GFP_KERNEL); + stid = kmem_cache_zalloc(slab, GFP_KERNEL); if (!stid) return NULL; @@ -467,11 +467,9 @@ kmem_cache *slab) if (new_id < 0) goto out_free; stid->sc_client = cl; - stid->sc_type = 0; stid->sc_stateid.si_opaque.so_id = new_id; stid->sc_stateid.si_opaque.so_clid = cl->cl_clientid; /* Will be incremented before return to client: */ - stid->sc_stateid.si_generation = 0; atomic_set(&stid->sc_count, 1); /* @@ -592,10 +590,8 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct sv INIT_LIST_HEAD(&dp->dl_perfile); INIT_LIST_HEAD(&dp->dl_perclnt); INIT_LIST_HEAD(&dp->dl_recall_lru); - dp->dl_file = NULL; dp->dl_type = NFS4_OPEN_DELEGATE_READ; fh_copy_shallow(&dp->dl_fh, ¤t_fh->fh_handle); - dp->dl_time = 0; INIT_WORK(&dp->dl_recall.cb_work, nfsd4_run_cb_recall); return dp; } @@ -616,6 +612,8 @@ void nfs4_put_delegation(struct nfs4_delegation *dp) { if (atomic_dec_and_test(&dp->dl_stid.sc_count)) { + if (dp->dl_file) + put_nfs4_file(dp->dl_file); remove_stid(&dp->dl_stid); nfs4_free_stid(deleg_slab, &dp->dl_stid); num_delegations--; @@ -665,13 +663,9 @@ unhash_delegation(struct nfs4_delegation *dp) list_del_init(&dp->dl_recall_lru); list_del_init(&dp->dl_perfile); spin_unlock(&fp->fi_lock); - if (fp) { + if (fp) nfs4_put_deleg_lease(fp); - dp->dl_file = NULL; - } spin_unlock(&state_lock); - if (fp) - put_nfs4_file(fp); } static void destroy_revoked_delegation(struct nfs4_delegation *dp) @@ -879,12 +873,12 @@ static void unhash_generic_stateid(struct nfs4_ol_stateid *stp) static void close_generic_stateid(struct nfs4_ol_stateid *stp) { release_all_access(stp); - put_nfs4_file(stp->st_file); - stp->st_file = NULL; } static void free_generic_stateid(struct nfs4_ol_stateid *stp) { + if (stp->st_file) + put_nfs4_file(stp->st_file); remove_stid(&stp->st_stid); nfs4_free_stid(stateid_slab, &stp->st_stid); } @@ -4447,6 +4441,10 @@ static void nfsd4_close_open_stateid(struct nfs4_ol_stateid *s) if (list_empty(&oo->oo_owner.so_stateids)) release_openowner(oo); } else { + if (s->st_file) { + put_nfs4_file(s->st_file); + s->st_file = NULL; + } oo->oo_last_closed_stid = s; /* * In the 4.0 case we need to keep the owners around a