From patchwork Mon May 15 15:37:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 9727365 X-Patchwork-Delegate: christophe.varoqui@free.fr 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 3995B6028A for ; Mon, 15 May 2017 15:39:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 343C628697 for ; Mon, 15 May 2017 15:39:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28F6228980; Mon, 15 May 2017 15:39:20 +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,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C746728697 for ; Mon, 15 May 2017 15:39:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D44180F7B; Mon, 15 May 2017 15:39:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9D44180F7B Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9D44180F7B Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 703277EDA2; Mon, 15 May 2017 15:39:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2DB3E4A490; Mon, 15 May 2017 15:39:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v4FFcRBG007963 for ; Mon, 15 May 2017 11:38:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 011C418226; Mon, 15 May 2017 15:38:27 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 411021798D; Mon, 15 May 2017 15:38:25 +0000 (UTC) Received: from prv3-mh.provo.novell.com (prv3-mh.provo.novell.com [137.65.250.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 987DF8EB29; Mon, 15 May 2017 15:38:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 987DF8EB29 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mwilck@suse.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 987DF8EB29 Received: from apollon.suse.de.de (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by prv3-mh.provo.novell.com with ESMTP (TLS encrypted); Mon, 15 May 2017 09:38:03 -0600 From: Martin Wilck To: Christophe Varoqui , Hannes Reinecke , Benjamin Marzinski Date: Mon, 15 May 2017 17:37:12 +0200 Message-Id: <20170515153722.11508-3-mwilck@suse.com> In-Reply-To: <20170515153722.11508-1-mwilck@suse.com> References: <20170515153722.11508-1-mwilck@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 203 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 15 May 2017 15:38:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 15 May 2017 15:38:18 +0000 (UTC) for IP:'137.65.250.26' DOMAIN:'prv3-mh.provo.novell.com' HELO:'prv3-mh.provo.novell.com' FROM:'mwilck@suse.com' RCPT:'' X-RedHat-Spam-Score: -1.501 (BAYES_50, RCVD_IN_DNSWL_MED, SPF_PASS) 137.65.250.26 prv3-mh.provo.novell.com 137.65.250.26 prv3-mh.provo.novell.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com Subject: [dm-devel] [PATCH v2 02/12] kpartx: remove "no_partitions" support X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 15 May 2017 15:39:19 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP The kernel does not support the "no_partitions" feature - remove it. Distributions who want to keep support for this feature should re-enable it with a distro-specific patch. Signed-off-by: Martin Wilck --- kpartx/devmapper.c | 29 ----------------------------- kpartx/kpartx.c | 5 ----- 2 files changed, 34 deletions(-) diff --git a/kpartx/devmapper.c b/kpartx/devmapper.c index cf6650c6..8aca9592 100644 --- a/kpartx/devmapper.c +++ b/kpartx/devmapper.c @@ -542,32 +542,3 @@ dm_remove_partmaps (char * mapname, char *uuid, int verbose) struct remove_data rd = { verbose }; return do_foreach_partmaps(mapname, uuid, remove_partmap, &rd); } - -#define FEATURE_NO_PART "no_partitions" - -int -dm_no_partitions(char *mapname) -{ - char params[PARAMS_SIZE], *ptr; - int i, num_features; - - if (dm_get_map(mapname, params)) - return 0; - - ptr = params; - num_features = strtoul(params, &ptr, 10); - if ((ptr == params) || num_features == 0) { - /* No features found, return success */ - return 0; - } - for (i = 0; (i < num_features); i++) { - if (!ptr || ptr > params + strlen(params)) - break; - /* Skip whitespaces */ - while(ptr && *ptr == ' ') ptr++; - if (!strncmp(ptr, FEATURE_NO_PART, strlen(FEATURE_NO_PART))) - return 1; - ptr = strchr(ptr, ' '); - } - return 0; -} diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c index 58e60ffe..e0c105f4 100644 --- a/kpartx/kpartx.c +++ b/kpartx/kpartx.c @@ -362,11 +362,6 @@ main(int argc, char **argv){ if (!mapname) mapname = device + off; - if (!force_devmap && - dm_no_partitions(mapname)) { - /* Feature 'no_partitions' is set, return */ - return 0; - } if (delim == NULL) { delim = malloc(DELIM_SIZE);