From patchwork Wed Jul 30 01:34:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4644401 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 45D0FC0338 for ; Wed, 30 Jul 2014 01:36:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70A7A2012D for ; Wed, 30 Jul 2014 01:36:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A20482012B for ; Wed, 30 Jul 2014 01:36:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754663AbaG3BfN (ORCPT ); Tue, 29 Jul 2014 21:35:13 -0400 Received: from mail-qa0-f50.google.com ([209.85.216.50]:51735 "EHLO mail-qa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751895AbaG3BfL (ORCPT ); Tue, 29 Jul 2014 21:35:11 -0400 Received: by mail-qa0-f50.google.com with SMTP id s7so583700qap.23 for ; Tue, 29 Jul 2014 18:35:11 -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=/qcZ6A3/auBMPVuTxotxQ9SDajhTuve6WPpLTDatvwE=; b=H6VgcUmJKu3eAPUIzXXsffssb/dp0GdY7Z3lgBQkGJ1rkP6W2ZJX34FiTuKej/5M+i Aca5N+Iz8t7ZZVEBE0hd/H2yg6yKcWCilBFfMp9IU6rbE3wES5aRUBp5U+zxphldbAU+ V7rtBwRoEmtrhkbI8i2XkhjhILaJBqCZswB5QJoHqKlyiv70LdqAMo/mKhVqRKHcvN0b VzlNbKlv2kMbDVuV964N6AwrwS/5p0aOlNTV0/XzSgRk+VUwaUSdV91kIgPkX4KyLncK WZkZUNTaIO32DtznToZ+3OJpEU0s9Zk4Ct3mqlogEFHBnLkfukkv5I7oFAwTWDIu6iEL 1IAQ== X-Gm-Message-State: ALoCoQm8F3GfiFU1n8RE2CfWvTATBwI/plJjfnqub4Bz95TbAytQXFfryB+xCvE71KgKvjQHhgNh X-Received: by 10.224.38.134 with SMTP id b6mr1396002qae.28.1406684110943; Tue, 29 Jul 2014 18:35:10 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id 81sm860946qgw.21.2014.07.29.18.35.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jul 2014 18:35:09 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org, Trond Myklebust Subject: [PATCH v3 14/38] nfsd: nfsd4_process_open2() must reference the open stateid Date: Tue, 29 Jul 2014 21:34:19 -0400 Message-Id: <1406684083-19736-15-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406684083-19736-1-git-send-email-jlayton@primarydata.com> References: <1406684083-19736-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=-7.6 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_process_open2() keeps a reference to the open stateid until it is done working with it. Necessary step toward client_mutex removal. Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5cb6305036cd..f3018cb26769 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2996,6 +2996,7 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfsd4_open *open, static void init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp, struct nfsd4_open *open) { struct nfs4_openowner *oo = open->op_openowner; + atomic_inc(&stp->st_stid.sc_count); stp->st_stid.sc_type = NFS4_OPEN_STID; INIT_LIST_HEAD(&stp->st_locks); stp->st_stateowner = &oo->oo_owner; @@ -3376,6 +3377,7 @@ nfsd4_find_existing_open(struct nfs4_file *fp, struct nfsd4_open *open) continue; if (local->st_stateowner == &oo->oo_owner) { ret = local; + atomic_inc(&ret->st_stid.sc_count); break; } } @@ -3836,6 +3838,8 @@ out: open->op_rflags |= NFS4_OPEN_RESULT_CONFIRM; if (dp) nfs4_put_stid(&dp->dl_stid); + if (stp) + nfs4_put_stid(&stp->st_stid); return status; }