Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp635586ybh; Thu, 12 Mar 2020 08:21:01 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsXzqsVjxZGvU91hEA+NuPMbHh8dqksGWHwS4m6DIZLj4WaNdjm68giU8xmgJ0o8Ro4rzo3 X-Received: by 2002:a05:6808:2ce:: with SMTP id a14mr2895383oid.37.1584026461337; Thu, 12 Mar 2020 08:21:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584026461; cv=none; d=google.com; s=arc-20160816; b=JqXPNOAAhNWR1aWa89/Yr+Fs3gKswu+lYMA+3LKcabii+X7d30SNl+gq+UTGfLPSZn o7KVEzmcCPK5C6tMeWyu/XlZOaE2rsvUOD5I7lu1fAgZXUD2aOh2jsTtVWnTbhv6g8mu JVkfJ7puSk9JsCYd8wUP3g9pCQ7jmjWCrfpbHrQLLdraZLotw/8D8Cha69E2hfDIsyUf NxUnjRlz7epLhZ2n71CP03T+eU5VFGDWo4Ax5yv9NF8cnz1Yqy1OZ4rulIvvvCn5mfo1 40E3R0LDMJdvVAhTwNkLHEnSmo0lyTPQVFk56zbdAK0gk/ZxWeYXjt80k8jsdkVlNTZ/ w/PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ABEU/z7lsXGuGe1amIkhjXTbw805aSLYXuvorFP/c3k=; b=ip0gH9e8moA04phdm9c/DYmSv9Ak1yKwW9CKQpHutOt0S7qYbO9oRoGcZvmQ1Pjzfu ElvtSOKc1MoNQckSEtTRXmm7ZSeI1yBpVoaqlADQ4MMMFwe+mmlB5zsUG2gwfIoV6ehl gqfCCe6WQJDehEuUqI0BSAWzhhhVfBhhZ/Wgj9RJ1rhTpEgTWjrsTeiG4eqf7EnOvUGW yKNHlV5Wo+6gnzj45Vhj8kAHiag5ALMJ/xbj76/Qe7wqqQ8tsmD0d2G1BDoV6SUhQskQ am7JLWs5tDxRmxMgnUCsDgjVFwNyqhD/rrOfb1jShWwXEX/OWBrTkUUOdziwLiYzXJ0i qCIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b="T/4LYR/a"; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c6si2780323otm.298.2020.03.12.08.20.49; Thu, 12 Mar 2020 08:21:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b="T/4LYR/a"; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727549AbgCLPUW (ORCPT + 99 others); Thu, 12 Mar 2020 11:20:22 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:38740 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727459AbgCLPUU (ORCPT ); Thu, 12 Mar 2020 11:20:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=ABEU/z7lsXGuGe1amIkhjXTbw805aSLYXuvorFP/c3k=; b=T/4LYR/akk9J+gFFrv/ViLv2an JbyCsYuHTCufoMBEiaU1qhf95fHWQ70Uur5ME2p4xxztO2ZqecS5iPT+dxt0vTuJYlJq0TPnGmuPY Ej3CfkeKY/YiRPsuLhefs4KfJHPTfuqTmd6Cz6woBT6OZBGOVBSO7jtE1n8GxdHuWuyim5QhEug3o Wv1U4ziLSqadY5UiLruOkuUFU1N2b6u7b3iVNvBoawleHe9VMPBOLCDZEyO+rHiseWSCYaDO3tbuv g1r5Hn1T9rIwko5J3R5mzRW00u5kuEebPFsJUplpkPMLBTcfeYc85zvlLwFxEorVeTXp/BjHhMo/f eyDiq9AQ==; Received: from [2001:4bb8:184:5cad:8026:d98c:a056:3e33] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jCPdE-0007uv-38; Thu, 12 Mar 2020 15:20:20 +0000 From: Christoph Hellwig To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-raid@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ext4@vger.kernel.org, reiserfs-devel@vger.kernel.org Subject: [PATCH 13/21] block: remove block/partitions/karma.h Date: Thu, 12 Mar 2020 16:19:31 +0100 Message-Id: <20200312151939.645254-14-hch@lst.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200312151939.645254-1-hch@lst.de> References: <20200312151939.645254-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Just move the single define to block/partitions/karma.c. Signed-off-by: Christoph Hellwig --- block/partitions/karma.c | 3 ++- block/partitions/karma.h | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 block/partitions/karma.h diff --git a/block/partitions/karma.c b/block/partitions/karma.c index 59812d705c3d..4d93512f4bd4 100644 --- a/block/partitions/karma.c +++ b/block/partitions/karma.c @@ -8,9 +8,10 @@ */ #include "check.h" -#include "karma.h" #include +#define KARMA_LABEL_MAGIC 0xAB56 + int karma_partition(struct parsed_partitions *state) { int i; diff --git a/block/partitions/karma.h b/block/partitions/karma.h deleted file mode 100644 index 1b5eec57ee0c..000000000000 --- a/block/partitions/karma.h +++ /dev/null @@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * fs/partitions/karma.h - */ - -#define KARMA_LABEL_MAGIC 0xAB56 -- 2.24.1