From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0CB2C432C3 for ; Sat, 16 Nov 2019 16:12:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A6DE21823 for ; Sat, 16 Nov 2019 16:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573920726; bh=3mBeHU26KDoJnerDrK7TIAfbbYuBh2vF/7RxufJMUZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CWhINLy4IyROtyNOdn9i/Q13u1zs3tsrtMM/03BwhQoZy526lcRF755az0HLjgE+V Z0FZLfaX/7WKMR4N2PHwjqMl3irH8h2y7TieP7PPUexcZoh+5cQVz9i+ZAPD7kpCF4 +ErYbWdX5/anQgigzsgRfvzBDnMU3t+WEc6l3TfE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731867AbfKPQMF (ORCPT ); Sat, 16 Nov 2019 11:12:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:55654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728735AbfKPPs3 (ORCPT ); Sat, 16 Nov 2019 10:48:29 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 262442081E; Sat, 16 Nov 2019 15:48:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919309; bh=3mBeHU26KDoJnerDrK7TIAfbbYuBh2vF/7RxufJMUZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m5FrDMJWjdpJ0BWoI/IfI32LA5WwdEVKXxEWZTdoSEmMOlhcXjyAEj3+O3EMzxeCG VhnORyuPSATJ1JLOez4eBM2ho7DLly5Ajq5DD0InoBKuhGKG/6PI57chWf4sZcp69V hqxS9I4Xtfn04vY1D9BSAzt3A+Z6eWrzAhL+cwug= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Heinz Mauelshagen , Mike Snitzer , Sasha Levin Subject: [PATCH AUTOSEL 4.14 052/150] dm raid: avoid bitmap with raid4/5/6 journal device Date: Sat, 16 Nov 2019 10:45:50 -0500 Message-Id: <20191116154729.9573-52-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154729.9573-1-sashal@kernel.org> References: <20191116154729.9573-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Heinz Mauelshagen [ Upstream commit d857ad75edf3c0066fcd920746f9dc75382b3324 ] With raid4/5/6, journal device and write intent bitmap are mutually exclusive. Signed-off-by: Heinz Mauelshagen Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm-raid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 151211b4cb1ba..2c5912e755148 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -2441,7 +2441,7 @@ static int super_validate(struct raid_set *rs, struct md_rdev *rdev) } /* Enable bitmap creation for RAID levels != 0 */ - mddev->bitmap_info.offset = rt_is_raid0(rs->raid_type) ? 0 : to_sector(4096); + mddev->bitmap_info.offset = (rt_is_raid0(rs->raid_type) || rs->journal_dev.dev) ? 0 : to_sector(4096); mddev->bitmap_info.default_offset = mddev->bitmap_info.offset; if (!test_and_clear_bit(FirstUse, &rdev->flags)) { -- 2.20.1