From patchwork Wed Jan 10 14:58:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Valente X-Patchwork-Id: 10155275 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 6EF3360231 for ; Wed, 10 Jan 2018 14:59:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 618732848B for ; Wed, 10 Jan 2018 14:59:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5641F28578; Wed, 10 Jan 2018 14:59:22 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 DEDC72848B for ; Wed, 10 Jan 2018 14:59:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932430AbeAJO7I (ORCPT ); Wed, 10 Jan 2018 09:59:08 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:39980 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933847AbeAJO7F (ORCPT ); Wed, 10 Jan 2018 09:59:05 -0500 Received: by mail-wr0-f193.google.com with SMTP id 100so1655138wrb.7 for ; Wed, 10 Jan 2018 06:59:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w1JuFyMyTUMkR8+ehoYI1Q3OvGOv886WKmcOmGR7iHY=; b=AmZ2CH6NCjhC1xRDnADTyziIlG+jUzswbCCP5Co1ZACKFPrMX+YIt1rg0ii7aK1ekN SaTI4wPUfMdgaxI0yYz8uy+T2LKSYNuY1p/vL7Kr8eHlGiOTFq0bflaa1ds8rTF3q7rI 2WN74bPSBeSWAGQU9Lq+4EbXzL5+a6NXlLrL0= 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=w1JuFyMyTUMkR8+ehoYI1Q3OvGOv886WKmcOmGR7iHY=; b=RV5Fls8zUV5HEBU7y1QCkADZi9eWFh485IZDa9ChlN4t8kTQsudsPRa72+Et1gr0kp PVC9knOXQqjcf3Ees7sq7LhzaSXrxpJ72DFPMo9GO0+xcyQ7ftsq7+cEKymCAsO6YbSr LZS8VeAVT6hAOfF1Y7rJyi7X+5EB5c0fhLGckF9PnWCFqyMoTUUO414nrDcLMpHzZFt/ qXdwcmWH7cFx21cXA4R1Rl7eJjOwmcAoci+HS5dO81rD3w4vt1rTR+yLp5N81PjJ7eU4 oJlE1lnZvMZFR+cNMELehIEJhdDvK05xspK0yK1M0JfIChKRJaiqlDg43D5R4+0MwYce Pu2A== X-Gm-Message-State: AKGB3mIUgeYL2uyhZcT0T6rHIk5Fda1BIXN3xOahDAJTjIRUyqG5/iT3 e7/rocHsdQS6xVoJ7j+0CpnAag== X-Google-Smtp-Source: ACJfBovG+lADSKkoP7PMi11qSWyfGYUsASqmfMM/aNjrcDRc3F6iIku+GenRiQtA8vCiIN3aSWTF5A== X-Received: by 10.223.131.229 with SMTP id 92mr16381001wre.255.1515596344763; Wed, 10 Jan 2018 06:59:04 -0800 (PST) Received: from wifi-122_dhcprange-5.wifi.unimo.it ([155.185.122.5]) by smtp.gmail.com with ESMTPSA id 53sm25346323wrv.20.2018.01.10.06.59.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 06:59:04 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, ulf.hansson@linaro.org, broonie@kernel.org, linus.walleij@linaro.org, bfq-iosched@googlegroups.com, oleksandr@natalenko.name, Paolo Valente Subject: [PATCH BUGFIX 1/1] block, bfq: compile group put for oom queue only if BFQ_GROUP_IOSCHED is set Date: Wed, 10 Jan 2018 15:58:56 +0100 Message-Id: <20180110145856.4040-2-paolo.valente@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180110145856.4040-1-paolo.valente@linaro.org> References: <20180110145856.4040-1-paolo.valente@linaro.org> 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 Commit ("block, bfq: release oom-queue ref to root group on exit") added a missing put of the root bfq group for the oom queue. That put has to be, and can be, performed only if CONFIG_BFQ_GROUP_IOSCHED is defined: the function doing the put is even not defined at all if CONFIG_BFQ_GROUP_IOSCHED is not defined. But that commit makes that put be invoked regardless of whether CONFIG_BFQ_GROUP_IOSCHED is defined. This commit fixes this mistake, by making that invocation be compiled only if CONFIG_BFQ_GROUP_IOSCHED is actually defined. Fixes ("block, bfq: release oom-queue ref to root group on exit") Reported-by: Jan Alexander Steffens Signed-off-by: Paolo Valente --- block/bfq-iosched.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index c56a495af2e8..93a97a7fe519 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5015,10 +5015,9 @@ static void bfq_exit_queue(struct elevator_queue *e) hrtimer_cancel(&bfqd->idle_slice_timer); +#ifdef CONFIG_BFQ_GROUP_IOSCHED /* release oom-queue reference to root group */ bfqg_and_blkg_put(bfqd->root_group); - -#ifdef CONFIG_BFQ_GROUP_IOSCHED blkcg_deactivate_policy(bfqd->queue, &blkcg_policy_bfq); #else spin_lock_irq(&bfqd->lock);