From patchwork Wed Feb 21 08:02:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Holmberg X-Patchwork-Id: 10231431 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 29F3F60209 for ; Wed, 21 Feb 2018 08:07:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DAAC28979 for ; Wed, 21 Feb 2018 08:07:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 125E72897C; Wed, 21 Feb 2018 08:07:55 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable 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 CA73E28979 for ; Wed, 21 Feb 2018 08:07:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751438AbeBUIH0 (ORCPT ); Wed, 21 Feb 2018 03:07:26 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34595 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751763AbeBUIDy (ORCPT ); Wed, 21 Feb 2018 03:03:54 -0500 Received: by mail-lf0-f65.google.com with SMTP id l191so1085917lfe.1 for ; Wed, 21 Feb 2018 00:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=owltronix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6BkLPq6biUlfhemDrcH6HzZA4SWtVM9qREVqgfSfIzY=; b=11wyclDwu2Wr1eKSxbFHo/Bbymw+/PMsl3T+JZ0bNqcPGwQdkIXnisZ4nmJM9lngAX K3D0OAEfOTVE7GkSWMk9GfCZYGl37YVWuU/xkNSlCAPP1QAVZ5cqKpfsJ6oBTdvP5GuT 43Qzyc5vSmiW1nRi1iRO55fav74YI4EWj5xvoGZzXB04zglYda4KWHKUd0V8vw2rEw7x C2L7mcTh5IFOYWvNdDQjMaPHpDhW0C91Km73pd6Ur/6E3uR5aWtVymDMeefiMCVXUKXQ 4F7pAeYfg3b8G/uxnM1cN3ml4wJUWYGg7aqvl6xRuthD/o8NoVUexEYhE+fJGNJ89LuF eGWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6BkLPq6biUlfhemDrcH6HzZA4SWtVM9qREVqgfSfIzY=; b=Hwgr9EC+7Legqr69xtOf8VN2qtoTggo0X/KbZK+a7lrcRIxOYu9nJkk/lhc7ku2KHg pB3WyXo5tEQKocz5pZR1br2Rs+Mqv6++Pj9Au0YKthXQJwU0QxZpljDTVoMz1ghMrokZ FhdL8J7YFYO+QcrxA0VxgOaFb+mMc34YZTHMpB5z4xDzn3rNguqhDgsh9tpP0Vqg1XBH IBFgswel1vC97JgsWhdqppt3ZFnVtmdBE7FtX9CXx5COYAAdT0nmSgh1gnC4ukfTWDXn Kh0+Hfd3uSaS65QTr03W25/gMVFmBqQv4I0I3VWehBSdqy9frqKuz2sFhnwklm+RyStb h02w== X-Gm-Message-State: APf1xPDaqVkW/kdw9tooJdnAGQLlyPR6nv+YipOWNrq5/RQvCWVPp3Yh SU36Qap2k0GS8heecNwgFJmoB1ZdcXQ= X-Google-Smtp-Source: AH8x2241EGOPDqvcZ0TBOFuNTr4HTjqZ8lvD3dSWHuZ3/o7RabugoZc2c/wMs2NaYXYciXYRwDZfAg== X-Received: by 10.25.15.170 with SMTP id 42mr1539318lfp.6.1519200233262; Wed, 21 Feb 2018 00:03:53 -0800 (PST) Received: from titan.bredbandsbolaget.se (c-b9b6e655.03-91-6d6c6d4.cust.bredbandsbolaget.se. [85.230.182.185]) by smtp.gmail.com with ESMTPSA id k8sm13417ljk.63.2018.02.21.00.03.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Feb 2018 00:03:52 -0800 (PST) From: hans.ml.holmberg@owltronix.com To: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Cc: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Holmberg Subject: [PATCH 1/3] lightnvm: pblk: delete writer kick timer before stopping thread Date: Wed, 21 Feb 2018 09:02:59 +0100 Message-Id: <1519200181-10886-2-git-send-email-hans.ml.holmberg@owltronix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519200181-10886-1-git-send-email-hans.ml.holmberg@owltronix.com> References: <1519200181-10886-1-git-send-email-hans.ml.holmberg@owltronix.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hans Holmberg Unless we delete the timer that wakes up the write thread before we stop the thread we risk re-starting the thread, so delete the timer first. Signed-off-by: Hans Holmberg --- drivers/lightnvm/pblk-init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c index a2b54a8..862ac4e 100644 --- a/drivers/lightnvm/pblk-init.c +++ b/drivers/lightnvm/pblk-init.c @@ -923,9 +923,9 @@ static void pblk_writer_stop(struct pblk *pblk) WARN(pblk_rb_sync_count(&pblk->rwb), "Stopping not fully synced write buffer\n"); + del_timer_sync(&pblk->wtimer); if (pblk->writer_ts) kthread_stop(pblk->writer_ts); - del_timer(&pblk->wtimer); } static void pblk_free(struct pblk *pblk)