From patchwork Thu Jun 19 14:50:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4384471 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 B396EBEEAA for ; Thu, 19 Jun 2014 14:53:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F2EAB20394 for ; Thu, 19 Jun 2014 14:53:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69D8C20395 for ; Thu, 19 Jun 2014 14:53:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932761AbaFSOxT (ORCPT ); Thu, 19 Jun 2014 10:53:19 -0400 Received: from mail-qc0-f169.google.com ([209.85.216.169]:42729 "EHLO mail-qc0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932579AbaFSOxQ (ORCPT ); Thu, 19 Jun 2014 10:53:16 -0400 Received: by mail-qc0-f169.google.com with SMTP id c9so2285489qcz.14 for ; Thu, 19 Jun 2014 07:53:16 -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=S+wIuQiC00wFN6QaIwyPRW7QxlPYQG72VbVF+5Ni2+E=; b=CdJpm96EpIqYA3XukQrzH6y5a86H8l9mtsmxONASZi5M6E0R80Ys3WXfIE3+uKPIew PdSlmue5DK1PReLgEPKddQowPZpfsNS39JnP3B1btcqFG8ZhSweuNRuIj5BQPaHp160M QjsSG3kZOKT3YcYwyulu72VzFg/uVOnHCYMDzFXHdjbXT6OqhHM7yGrzLodjKACra4E4 kp9lbRoSs450Wy/ozisSFH6tabu59Jr08fXPVl+QxHPm4+AT3wTN7NzKYNesnAnz1ako TGiQwBfrvck+gd4ri9mnmRkNEe31EK/v2bf9264YSVDC4x6fKf5/tQULZjpGzBQjkTQC 0ByQ== X-Gm-Message-State: ALoCoQkEwdiIMdqwWDrqwxyxv3ppSHdzjKd32eOYiFSUctIluqdnMz73Z6NznmyEFMzBXPKlL4cd X-Received: by 10.224.137.193 with SMTP id x1mr8314453qat.0.1403189596227; Thu, 19 Jun 2014 07:53:16 -0700 (PDT) Received: from tlielax.poochiereds.net (cpe-107-015-124-230.nc.res.rr.com. [107.15.124.230]) by mx.google.com with ESMTPSA id r60sm3364044qgd.26.2014.06.19.07.53.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:53:15 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 097/104] NFSd: Remove nfs4_lock_state(): nfsd4_open and nfsd4_open_confirm Date: Thu, 19 Jun 2014 10:50:43 -0400 Message-Id: <1403189450-18729-98-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403189450-18729-1-git-send-email-jlayton@primarydata.com> References: <1403189450-18729-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 From: Trond Myklebust Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4proc.c | 3 --- fs/nfsd/nfs4state.c | 6 ------ 2 files changed, 9 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 833c753e4775..0b718f545785 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -385,8 +385,6 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if (nfsd4_has_session(cstate)) copy_clientid(&open->op_clientid, cstate->session); - nfs4_lock_state(); - /* check seqid for replay. set nfs4_owner */ resp = rqstp->rq_resp; status = nfsd4_process_open1(&resp->cstate, open, nn); @@ -469,7 +467,6 @@ out: } 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 e19a5961bf62..0dfe24e0aa61 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3809,9 +3809,6 @@ static void nfsd4_deleg_xgrade_none_ext(struct nfsd4_open *open, */ } -/* - * called with nfs4_lock_state() held. - */ __be32 nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open) { @@ -4519,8 +4516,6 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if (status) return status; - nfs4_lock_state(); - status = nfs4_preprocess_seqid_op(cstate, oc->oc_seqid, &oc->oc_req_stateid, NFS4_OPEN_STID, &stp, nn); @@ -4542,7 +4537,6 @@ put_stateid: put_generic_stateid(stp); out: nfsd4_bump_seqid(cstate, status); - nfs4_unlock_state(); return status; }