From patchwork Mon Jul 21 15:02:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4596101 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 CA0AF9F2B8 for ; Mon, 21 Jul 2014 15:04:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A710820114 for ; Mon, 21 Jul 2014 15:04:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 938EB20158 for ; Mon, 21 Jul 2014 15:04:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932437AbaGUPDi (ORCPT ); Mon, 21 Jul 2014 11:03:38 -0400 Received: from mail-qc0-f179.google.com ([209.85.216.179]:43621 "EHLO mail-qc0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754936AbaGUPDg (ORCPT ); Mon, 21 Jul 2014 11:03:36 -0400 Received: by mail-qc0-f179.google.com with SMTP id r5so5713124qcx.10 for ; Mon, 21 Jul 2014 08:03:35 -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=WCxLaKNgjBV7NdLiBOuB8a9a2RDt68wVE2vdHTHuAZQ=; b=EVQonhOmA4PePjuZHn1EIWnDGdKSO9JVHCo+UNNs2nWd5xsKTyupZBVP4WM/I70JXq OFNi5C7TfkStyyuscQaJfz3CgZFA817tYin7nqCcU02E+zsVOtbYHzc9jmgPwXyfVTdW SUP0yFdX/DYJXbvKhTGyrEHdaO+LM3Ggb4AKaTUkmUG0A6kZ2o+CPkYdPLLSGzhO167r GyjipNNRbU+hgaLo8jTIrS2auhu3GsALEeb7YNY8LHhC7wn6Kk6NMwJn6rGFvob9bsCm +6TTTft9RM6GRW/adGL5YTRy+xnq1KfxIU8dmjEeFdZeD9S+ndkuCXN8pGfbDc0/DdUy ZwYw== X-Gm-Message-State: ALoCoQlhPMmu9xMGtpBpti6/5KfyiV3Y2gV+dF0ipOAzXHdo67HJbyYzOlNgSse+f75Wj6cpSQcb X-Received: by 10.140.93.161 with SMTP id d30mr39395913qge.53.1405955015160; Mon, 21 Jul 2014 08:03:35 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id l76sm16375384qga.8.2014.07.21.08.03.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jul 2014 08:03:34 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org, Trond Myklebust Subject: [PATCH 25/40] nfsd: Keep a reference to the open stateid for the NFSv4.0 replay cache Date: Mon, 21 Jul 2014 11:02:37 -0400 Message-Id: <1405954972-28904-26-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405954972-28904-1-git-send-email-jlayton@primarydata.com> References: <1405954972-28904-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 Ensure that nfsd4_cstate_assign_replay/nfsd4_cstate_clear_replay take a reference to the stateowner when they are using it for NFSv4.0 open and lock replay caching. Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4proc.c | 5 +---- fs/nfsd/nfs4state.c | 26 +++++++++++++++++++++++++- fs/nfsd/xdr4.h | 26 ++++---------------------- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 7c82cc98e71b..29cf395b694e 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -469,10 +469,7 @@ out: fh_put(resfh); kfree(resfh); } - nfsd4_cleanup_open_state(open, status); - if (open->op_openowner) - nfsd4_cstate_assign_replay(cstate, - &open->op_openowner->oo_owner); + nfsd4_cleanup_open_state(cstate, open, status); nfsd4_bump_seqid(cstate, status); nfs4_unlock_state(); return status; diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6886135b82ec..4f518fb453b5 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2951,6 +2951,27 @@ static void init_nfs4_replay(struct nfs4_replay *rp) mutex_init(&rp->rp_mutex); } +static void nfsd4_cstate_assign_replay(struct nfsd4_compound_state *cstate, + struct nfs4_stateowner *so) +{ + if (!nfsd4_has_session(cstate)) { + mutex_lock(&so->so_replay.rp_mutex); + cstate->replay_owner = so; + atomic_inc(&so->so_count); + } +} + +void nfsd4_cstate_clear_replay(struct nfsd4_compound_state *cstate) +{ + struct nfs4_stateowner *so = cstate->replay_owner; + + if (so != NULL) { + cstate->replay_owner = NULL; + mutex_unlock(&so->so_replay.rp_mutex); + nfs4_put_stateowner(so); + } +} + static inline void *alloc_stateowner(struct kmem_cache *slab, struct xdr_netobj *owner, struct nfs4_client *clp) { struct nfs4_stateowner *sop; @@ -3871,7 +3892,8 @@ out: return status; } -void nfsd4_cleanup_open_state(struct nfsd4_open *open, __be32 status) +void nfsd4_cleanup_open_state(struct nfsd4_compound_state *cstate, + struct nfsd4_open *open, __be32 status) { if (open->op_openowner) { struct nfs4_openowner *oo = open->op_openowner; @@ -3885,6 +3907,8 @@ void nfsd4_cleanup_open_state(struct nfsd4_open *open, __be32 status) } else oo->oo_flags &= ~NFS4_OO_NEW; } + if (open->op_openowner) + nfsd4_cstate_assign_replay(cstate, &oo->oo_owner); } if (open->op_file) nfsd4_free_file(open->op_file); diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index 7442dc7efd31..465e7799742a 100644 --- a/fs/nfsd/xdr4.h +++ b/fs/nfsd/xdr4.h @@ -74,27 +74,6 @@ static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs) return cs->slot != NULL; } -static inline void -nfsd4_cstate_assign_replay(struct nfsd4_compound_state *cstate, - struct nfs4_stateowner *so) -{ - if (!nfsd4_has_session(cstate)) { - mutex_lock(&so->so_replay.rp_mutex); - cstate->replay_owner = so; - } -} - -static inline void -nfsd4_cstate_clear_replay(struct nfsd4_compound_state *cstate) -{ - struct nfs4_stateowner *so = cstate->replay_owner; - - if (so != NULL) { - cstate->replay_owner = NULL; - mutex_unlock(&so->so_replay.rp_mutex); - } -} - struct nfsd4_change_info { u32 atomic; bool change_supported; @@ -620,7 +599,9 @@ extern __be32 nfsd4_process_open1(struct nfsd4_compound_state *, struct nfsd4_open *open, struct nfsd_net *nn); extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open); -extern void nfsd4_cleanup_open_state(struct nfsd4_open *open, __be32 status); +extern void nfsd4_cstate_clear_replay(struct nfsd4_compound_state *cstate); +extern void nfsd4_cleanup_open_state(struct nfsd4_compound_state *cstate, + struct nfsd4_open *open, __be32 status); extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *, struct nfsd4_open_confirm *oc); extern __be32 nfsd4_close(struct svc_rqst *rqstp, @@ -651,6 +632,7 @@ extern __be32 nfsd4_test_stateid(struct svc_rqst *rqstp, extern __be32 nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *, struct nfsd4_free_stateid *free_stateid); extern void nfsd4_bump_seqid(struct nfsd4_compound_state *, __be32 nfserr); + #endif /*