From patchwork Thu Jun 19 14:50:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4384151 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 5886BBEEAA for ; Thu, 19 Jun 2014 14:52:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 982AB20384 for ; Thu, 19 Jun 2014 14:52:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF46320396 for ; Thu, 19 Jun 2014 14:52:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757898AbaFSOw0 (ORCPT ); Thu, 19 Jun 2014 10:52:26 -0400 Received: from mail-qc0-f181.google.com ([209.85.216.181]:45559 "EHLO mail-qc0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757917AbaFSOw0 (ORCPT ); Thu, 19 Jun 2014 10:52:26 -0400 Received: by mail-qc0-f181.google.com with SMTP id x13so2231776qcv.26 for ; Thu, 19 Jun 2014 07:52:25 -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=DJohq05wtJiEKNdRNJUTKR/f91YA2wBZP4PqJzjGjUs=; b=hjZyS5iRayuqHmrGv+Vxz/8v6sLjSNK6DkEQMwyQ5wAXP/KzuZa0dJ52s3Q4rdBHAC PgQfkBfsyrwuapYzletTsbKLZWEGBi5HOuDhBkSfUoNv+ogZg5MIWk8kcMhoMu1rpvG8 ERQfz66AImtJjDnFk+Hzsv6RG9YVhJNPtK488r0JsBpZqstJPIpyj45X2X71LLjKPeBg h75NOgU6M3BujyukBUCsXychO41DSZZIqgxKXF4Pq3LRdscx6MiFt1VgeOxyt5QB069I /VAKg54Zaa0bLGzermxhMBWrN5uLQHtH6SHAb1U4eiHZbgM8sWm4zyI3JbaNrQY7sjG+ mLPA== X-Gm-Message-State: ALoCoQk4o5zgXXhsFyn7SwjC3xIhOXJoR3zbL+uCKrIMDANcyordotLcjKaXALmMa88oJz+4UPDG X-Received: by 10.140.30.73 with SMTP id c67mr733922qgc.16.1403189545252; Thu, 19 Jun 2014 07:52:25 -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.52.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:52:24 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 060/104] NFSd: Always use lookup_clientid() in nfsd4_process_open1 Date: Thu, 19 Jun 2014 10:50:06 -0400 Message-Id: <1403189450-18729-61-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 Preparation for moving the stateowner table into the nfs4_client Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 42c5f487a7a5..4b668d0430b8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3268,19 +3268,19 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate, if (open->op_file == NULL) return nfserr_jukebox; + status = lookup_clientid(clientid, cstate, nn); + if (status) + return status; + clp = cstate->clp; + strhashval = ownerstr_hashval(clientid->cl_id, &open->op_owner); oo = find_openstateowner_str(strhashval, open, cstate->minorversion, nn); open->op_openowner = oo; if (!oo) { - status = lookup_clientid(clientid, cstate, nn); - if (status) - return status; - clp = cstate->clp; goto new_owner; } if (!(oo->oo_flags & NFS4_OO_CONFIRMED)) { /* Replace unconfirmed owners without checking for replay. */ - clp = oo->oo_owner.so_client; release_openowner(oo); open->op_openowner = NULL; goto new_owner; @@ -3288,7 +3288,6 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate, status = nfsd4_check_seqid(cstate, &oo->oo_owner, open->op_seqid); if (status) return status; - clp = oo->oo_owner.so_client; goto alloc_stateid; new_owner: oo = alloc_init_open_stateowner(strhashval, open, cstate);