From patchwork Thu Jun 26 19:21:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4431271 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 AC16B9F758 for ; Thu, 26 Jun 2014 19:22:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2BB420154 for ; Thu, 26 Jun 2014 19:22:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 07D95201BA for ; Thu, 26 Jun 2014 19:22:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751536AbaFZTWG (ORCPT ); Thu, 26 Jun 2014 15:22:06 -0400 Received: from mail-qc0-f169.google.com ([209.85.216.169]:57033 "EHLO mail-qc0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751570AbaFZTVm (ORCPT ); Thu, 26 Jun 2014 15:21:42 -0400 Received: by mail-qc0-f169.google.com with SMTP id c9so3604138qcz.28 for ; Thu, 26 Jun 2014 12:21:41 -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=Ol1j2gxu5bF3ro52q35dMgvBDl7ippAuHMfCwP0Fs+U=; b=h0sCjnCY3t8117DOtGRcjtU31aW2JvCFkfm7czAvCCp3FRAMnNr5Gp1mZhP/O+0aRn P9h1x9esiFKhMCGMCw/+Va3+B2LEeFGszZ8Ob9JelrC/6NE+anBWqon0R33gtlK8oS2u E2If7n44LEgRz+t2fViW65Ee8xm7pn45DlI9gjNIn/xCqKYdOBmCf/zl7AZrd0xgHclb fBlHDlyAxMMlbRfdKBi5gOAE4PAOOLLPdPjNrF40jVJgpo3VBtFY9IFiKhwKS7SSnnsF QKXwkcsi07QGFZoeg8OfBeu9s2NLVumsELlfxOA/gvh3b2bsRb1VJ+A4S3VLjp1RHy9X 9j9A== X-Gm-Message-State: ALoCoQm3KMpBsDLraUfBGQGDs1H6XMsEnVdiX92D3jIXUv5eCJ+JSI5W30o9m3txX4s7U2wa9k1q X-Received: by 10.140.28.182 with SMTP id 51mr23987042qgz.49.1403810501885; Thu, 26 Jun 2014 12:21:41 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id k76sm4765555qgd.38.2014.06.26.12.21.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jun 2014 12:21:41 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 092/117] nfsd: don't destroy client if mark_client_expired_locked fails Date: Thu, 26 Jun 2014 15:21:00 -0400 Message-Id: <1403810485-16497-9-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403810017-16062-1-git-send-email-jlayton@primarydata.com> References: <1403810017-16062-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 If it fails, it means that the client is in use and so destroying it would be bad. Currently, the client_mutex prevents this from happening but once we remove it, we won't be able to do this. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 3bd24d5b973e..014849dfaa4b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2447,8 +2447,10 @@ nfsd4_create_session(struct svc_rqst *rqstp, old = find_confirmed_client_by_name(&unconf->cl_name, nn); if (old) { status = mark_client_expired_locked(old); - if (status) + if (status) { + old = NULL; goto out_free_conn; + } } move_to_confirmed(unconf); conf = unconf; @@ -2992,8 +2994,10 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, old = find_confirmed_client_by_name(&unconf->cl_name, nn); if (old) { status = mark_client_expired_locked(old); - if (status) + if (status) { + old = NULL; goto out; + } } move_to_confirmed(unconf); conf = unconf;