From patchwork Tue Aug 30 00:03:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9304663 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A9CAD6077C for ; Tue, 30 Aug 2016 00:04:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BCC628970 for ; Tue, 30 Aug 2016 00:04:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 807BB289E1; Tue, 30 Aug 2016 00:04:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22AE828970 for ; Tue, 30 Aug 2016 00:04:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757213AbcH3AEk (ORCPT ); Mon, 29 Aug 2016 20:04:40 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:34935 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757097AbcH3AEj (ORCPT ); Mon, 29 Aug 2016 20:04:39 -0400 Received: by mail-it0-f68.google.com with SMTP id f128so631299ith.2 for ; Mon, 29 Aug 2016 17:04:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=YkIeGGZi1HGtley+vvLxZUSBKpA1wnjIHCuErRpYQoI=; b=xixNU5d+RuEvcvVTL3ck+e/8KrUggnKuqsJK9a0+5IEEMmt9pvtdOBODup6uX8OBnS WLcAuW4ziPXgjfnYgxryLiJdsx0zXvlyVI7GlK4tGepksTVLbosR3FY46n8qzYIkpHcX Iy28I7h606lkFCQCNrOzjnIHEZ+fs0ccbyTP+65q/Nbwdj6a84yRkF8GCxFDUfXLSFWs AS7LKZiBP7L2YiYL+NrEbKH4uWMmYJc5C55cXElYVMUZ630+jwOF30fEdzB7sztdLEcr +W+QxrHiQEP2cscKLBJVveSit6KSTtMFXGaFiOJ6WXGLFyvj49zB4gvbHSflm2rwA1SP Ch0A== 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:subject:date:message-id :in-reply-to:references; bh=YkIeGGZi1HGtley+vvLxZUSBKpA1wnjIHCuErRpYQoI=; b=fBiqAByWjhqGk0oSwyc0UhGgqXXkjRPnkT6t2g8LidfkENQ7mILPmRiUbkn1F31Tfa DplSJrjOZU7APPrvB9P1vQTKuK3KFNFj9z2QT932kyT3/TmD00pkiVVO3Kh5jEE/teSM d7/xZXxpJQnS3Ur4IFHU1G6+yZRsA63X8Xj6SgB24efR8tw6NntyYhdiOh/Gzin+toJe Ti8hR4G589LAVO8FTdfmO5S6evMDQl7iaCBF5Z4nHXEWExAaWpiDkpPg/ejP3lbiylCx noM91s0B9CnEPJx7jpWObvpwnGk6DRXNHo77IcAMGRqae9w/xB/1YeNQfym4hQm/43+t CcxQ== X-Gm-Message-State: AE9vXwNeV5De1ANSdvQn/hdtVP/4+s7er2mE5Dv6cRDglBNBq8kgJ7tLEFRi01cIPfuD0g== X-Received: by 10.36.84.135 with SMTP id t129mr20504984ita.63.1472515478392; Mon, 29 Aug 2016 17:04:38 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id 140sm7994943itl.4.2016.08.29.17.04.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Aug 2016 17:04:38 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 4/6] NFSv4.x: Fix up the global tracking of the callback server Date: Mon, 29 Aug 2016 20:03:50 -0400 Message-Id: <1472515432-54202-5-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472515432-54202-4-git-send-email-trond.myklebust@primarydata.com> References: <1472515432-54202-1-git-send-email-trond.myklebust@primarydata.com> <1472515432-54202-2-git-send-email-trond.myklebust@primarydata.com> <1472515432-54202-3-git-send-email-trond.myklebust@primarydata.com> <1472515432-54202-4-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Ensure that the nfs_callback_info[] array correctly tracks the struct svc_serv. Signed-off-by: Trond Myklebust --- fs/nfs/callback.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 08e16f9b3333..b125f02ddf8b 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -201,7 +201,6 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt, svc_sock_update_bufs(serv); - cb_info->serv = serv; cb_info->rqst = rqstp; cb_info->task = kthread_create(serv->sv_ops->svo_function, cb_info->rqst, @@ -300,7 +299,7 @@ static struct svc_serv *nfs_callback_create_svc(int minorversion) /* * Check whether we're already up and running. */ - if (cb_info->task) { + if (cb_info->serv) { /* * Note: increase service usage, because later in case of error * svc_destroy() will be called. @@ -333,6 +332,7 @@ static struct svc_serv *nfs_callback_create_svc(int minorversion) printk(KERN_ERR "nfs_callback_create_svc: create service failed\n"); return ERR_PTR(-ENOMEM); } + cb_info->serv = serv; /* As there is only one thread we need to over-ride the * default maximum of 80 connections */ @@ -375,6 +375,8 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt) * thread exits. */ err_net: + if (!cb_info->users) + cb_info->serv = NULL; svc_destroy(serv); err_create: mutex_unlock(&nfs_callback_mutex); @@ -396,9 +398,11 @@ void nfs_callback_down(int minorversion, struct net *net) mutex_lock(&nfs_callback_mutex); nfs_callback_down_net(minorversion, cb_info->serv, net); cb_info->users--; - if (cb_info->users == 0 && cb_info->task != NULL) { - kthread_stop(cb_info->task); - dprintk("nfs_callback_down: service stopped\n"); + if (cb_info->users == 0) { + if (cb_info->task != NULL) { + kthread_stop(cb_info->task); + dprintk("nfs_callback_down: service stopped\n"); + } svc_exit_thread(cb_info->rqst); dprintk("nfs_callback_down: service destroyed\n"); cb_info->serv = NULL;