From patchwork Wed Jul 30 13:26:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 4649151 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 859879F32F for ; Wed, 30 Jul 2014 13:26:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9F5C020158 for ; Wed, 30 Jul 2014 13:26:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D81B72012B for ; Wed, 30 Jul 2014 13:26:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753449AbaG3N0c (ORCPT ); Wed, 30 Jul 2014 09:26:32 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:44719 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753441AbaG3N0a (ORCPT ); Wed, 30 Jul 2014 09:26:30 -0400 Received: by mail-pd0-f170.google.com with SMTP id g10so1455655pdj.29 for ; Wed, 30 Jul 2014 06:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=fmTpUxSxFw4S17aKMcSHABhrnn1IkWHG4HetqPvMn+M=; b=0XVOCmEj1TUC5WUzPkuGrmXNj7fJmAANj0YHL4rdanaYrtsERk8evPOLAEmsXDVz80 EPcYNZ8KL4Xt2KH3HSVuQ9LMuI2z/RKFTNNv/cbGukvMahlrrgUze/52tJgcSA5hEgig EWH177noI4uZ5wRYulzbUXTfWVbbpsTw6OBFwu8MChcAh8Fn4+V6MUu8THhHttFNkdVG dl1LTUKWeTpYgvy1PRuTh4n3aKUXROpTA2hbwjM9c5i/3LuzAgownCRgvFpmMNrs7hAk iPUJyLI7uLZWLPVMSPM4uIr/fDWCtdo7ZK9y+j+OUY6ITEkVY5Q3HmkRAnrCOdmLKFOH gH0Q== X-Received: by 10.66.236.6 with SMTP id uq6mr4708794pac.24.1406726789879; Wed, 30 Jul 2014 06:26:29 -0700 (PDT) Received: from [192.168.0.100] ([171.215.249.192]) by mx.google.com with ESMTPSA id da7sm3538065pdb.4.2014.07.30.06.26.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jul 2014 06:26:28 -0700 (PDT) Message-ID: <53D8F26D.8070304@gmail.com> Date: Wed, 30 Jul 2014 21:26:05 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: "J. Bruce Fields" CC: Linux NFS Mailing List , kinglongmee@gmail.com Subject: [PATCH] NFSD: Decrease nfsd_users in nfsd_startup_generic fail 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.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 nfsd_startup_generic fail, nfsd_users isn't decreased right now. NFSD restarts will return 0 at the first nfsd_users checking, after that, nfs4_state_start_net() will meet a bad laundry_wq (I meet NULL), after nfsd4_grace timeout, the kernel will crash. Signed-off-by: Kinglong Mee --- fs/nfsd/nfssvc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 5d026dc..752d56b 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -221,7 +221,8 @@ static int nfsd_startup_generic(int nrservs) */ ret = nfsd_racache_init(2*nrservs); if (ret) - return ret; + goto dec_users; + ret = nfs4_state_start(); if (ret) goto out_racache; @@ -229,6 +230,8 @@ static int nfsd_startup_generic(int nrservs) out_racache: nfsd_racache_shutdown(); +dec_users: + nfsd_users--; return ret; }