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=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 11AC4C43441 for ; Tue, 20 Nov 2018 10:22:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC18A208E3 for ; Tue, 20 Nov 2018 10:22:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=yehs2007@zoho.com header.b="KGazHKFw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC18A208E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=zoho.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727809AbeKTUue (ORCPT ); Tue, 20 Nov 2018 15:50:34 -0500 Received: from sender-pp-092.zoho.com ([135.84.80.237]:25327 "EHLO sender-pp-092.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726548AbeKTUue (ORCPT ); Tue, 20 Nov 2018 15:50:34 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1542709287; cv=none; d=zoho.com; s=zohoarc; b=Q7EuFKCNpEWAFLIJlK1cYneAB4xYIifVbUUi9l8/RjQrpQviuBKzOCtoUjJvoGgPosswQmzvmj6t1gHWZfS2PKRC6N/2vILDPki/ROPHjmeWekZ2o+QjHKIqbr/KZe93a/hyolZJzwLlPkznZlYUrqvMPrNx9nqG/1/MBDrtCA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1542709287; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=GHh1ilgk8ZdCIo8lwzMZINvkNuuU7rjdcC8nSOe4YS4=; b=JshvvVSeKvGq0W/MWkOgV+lolwe2BMjrC3sLidUqWK3Bo+sB3qG2Hr4gzNRyYzKpFF5WjO0TEwP/vccfPxkQLR2IKL92HlBxBZmdddppV3IKFGQUrHlZJ2sHjCG+mrD1yQ/hA1H3NpENkeNEK7/HlgkT4Dq4SB03uEvo3sXhivM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=zoho.com; spf=pass smtp.mailfrom=yehs2007@zoho.com; dmarc=pass header.from= header.from= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; b=PRJ0BZSCl2Y8jcBUX2b/SG3G/ZvQrI6I+sn0PcFlqFv5j5PGuH1N3v/aFmGteNYF4RGgd8QIWuL0 Ex77TMkB9phPhE8WrsmyoLqSgYDfTvCCTmoolMV3FGPeQzt/XziZ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1542709287; s=default; d=zoho.com; i=yehs2007@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=1150; bh=GHh1ilgk8ZdCIo8lwzMZINvkNuuU7rjdcC8nSOe4YS4=; b=KGazHKFwhgtqQqo0CnoGftEYRLjZZyaVGcZQhFwzeyu85rMJ+IwjMcC2L95uT1ly xNeB2Nhm6zwXFaiG7hvm0p0wD0jLj902qYvePAY/pv/iGMnkUaWOq42CXLXRGX4P7kG MZU8E34kVC0JVY/nakZLsMV/+POExLGudTI1O2hc= Received: from YEHS1XR956R00D1.lenovo.com (58.243.153.247 [58.243.153.247]) by mx.zohomail.com with SMTPS id 1542709286690283.4299240192355; Tue, 20 Nov 2018 02:21:26 -0800 (PST) From: Huaisheng Ye To: linux-nvdimm@lists.01.org, agk@redhat.com, snitzer@redhat.com, dm-devel@redhat.com, dan.j.williams@intel.com, willy@infradead.org, zwisler@kernel.org, jack@suse.cz, dave.jiang@intel.com, vishal.l.verma@intel.com Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, chengnt@lenovo.com, Huaisheng Ye Subject: [RFC PATCH 3/3] dm: expand valid types for dm-ioctl Date: Tue, 20 Nov 2018 18:20:37 +0800 Message-Id: <20181120102037.4536-4-yehs2007@zoho.com> X-Mailer: git-send-email 2.17.0.windows.1 In-Reply-To: <20181120102037.4536-1-yehs2007@zoho.com> References: <20181120102037.4536-1-yehs2007@zoho.com> X-ZohoMailClient: External Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huaisheng Ye If use DAX way to mount the origin device of dm_snapshot, when merging back snapshot to origin, system call table_load during the construction of snapshot-merge will try to detect new dm_table's type equals to the existed md's type or not. The existed type equals to DM_TYPE_DAX_BIO_BASED, but the new created type belongs to DM_TYPE_BIO_BASED. So, we need to expand valid_type in function is_valid_type. Signed-off-by: Huaisheng Ye --- drivers/md/dm-ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index a27016e..158d657 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1295,7 +1295,8 @@ static int populate_table(struct dm_table *table, static bool is_valid_type(enum dm_queue_mode cur, enum dm_queue_mode new) { if (cur == new || - (cur == DM_TYPE_BIO_BASED && new == DM_TYPE_DAX_BIO_BASED)) + (cur == DM_TYPE_BIO_BASED && new == DM_TYPE_DAX_BIO_BASED) || + (cur == DM_TYPE_DAX_BIO_BASED && new == DM_TYPE_BIO_BASED)) return true; return false; -- 1.8.3.1