Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp635897ybh; Thu, 12 Mar 2020 08:21:18 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtIh2HItuc8G3N0uQJkKAjy8h018W+7RcWeQhASTTK7jaXSU5hXYkDbj7hvkmjRgcEtxBlm X-Received: by 2002:a9d:a51:: with SMTP id 75mr6597568otg.112.1584026478311; Thu, 12 Mar 2020 08:21:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584026478; cv=none; d=google.com; s=arc-20160816; b=XdUFH2C8Fh0tCgcRW9Iimps/iXyNT3RB/Smfpwt+R01ZAkTg3zZcf5nKf38WQ3iSmW VG+QCV59NmX6SnKe1dg2F0yglpPdRnoqL3wuQnMxH6oW2v2DGw/hYnfGoF7dKdYxMHLy GmyWAXKyd8LE9N3qdxaItz/SS6BOGTU5E9cFMvHGnOjNiUWvJ8790KfPI7rTPW6Jzyrt bRbWJGi0fMRUUgMKHLj57KJ2cWCnqZWAFc0AK3O9gQ0EOHydAxmsqghljrSjwqeUushv WzJ3osyfJSydyzJ2tU9qzuhL1CVjxbh409yTA1d10aqjyZqd8FJbSw4DvAPeK1oDMd1v d/OQ== 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=kLwglDMh0TVz4LfdfVy31AKX5i4dfmAxdHb0FAmOyYI=; b=rzpbDG1s1JV0s+m/HwpcWJvFEmTnZB47zL8jAg7Bfkk4R1jo4vS9PQBT9xEo7jwswY 9HAxdQRace0TC8W0Yx9Ps+MEy795PfOLc/Idi8j0fEorEZV3JkUf/0Lr7RpEqqcF7HAi MfNN451KMM7oQu+R1fQQZQvCUp5eUZaehnXZOLQtTLeAFm0PKuzVtKJgUb/3TDdyUnhy bzQas62R6FPaGbIKkW4Ah8PhBGpIglBZlVRGv19PqcBOLsJ6jf+NuzP0lc6Kka8CPHPt MFRtL5Q5HvvmN8ewJFv/fAzgDOH9C/tzUJKxWKLVHM+QBUiY1EYnq7mTmQU5BUcgH9vg 1kMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=LIqb4I1i; 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 d185si990406oif.234.2020.03.12.08.21.07; Thu, 12 Mar 2020 08:21:18 -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=LIqb4I1i; 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 S1727928AbgCLPU2 (ORCPT + 99 others); Thu, 12 Mar 2020 11:20:28 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:38780 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727459AbgCLPU0 (ORCPT ); Thu, 12 Mar 2020 11:20:26 -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=kLwglDMh0TVz4LfdfVy31AKX5i4dfmAxdHb0FAmOyYI=; b=LIqb4I1iQKYZjDizrHubTytfPV qi150L1ksPz/QYLF29sQS+zzBACSqgvXE2bZAi3IFbDIeOWButtgj1dsGSD1+V4aHJrKj+1uJyJhP 1L/iQaQvLCa80SJDRoO+CK1dNJf0urKxrx7GuJWfjhr1pVKzF/FAjt2F67GBl42W9kJa/DrF3bQcN icGXwSbC4SRvF12NbxU3lYHiXJeQL8BgRsAEmNocjgBXb/2tet+vQpRRA5O14drsEx55B65uHXgrx Pkeldy7rH2RWNkoMQ8Qaa9XU5Vbmohdq4og6F6a+2Gh12lXKWcII3SBhnleeIuq6pITG9X4CzJ3Sv IMUovNjQ==; 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 1jCPdJ-0007wd-H2; Thu, 12 Mar 2020 15:20:25 +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 15/21] block: remove block/partitions/sgi.h Date: Thu, 12 Mar 2020 16:19:33 +0100 Message-Id: <20200312151939.645254-16-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/sgi.c. Signed-off-by: Christoph Hellwig --- block/partitions/sgi.c | 3 ++- block/partitions/sgi.h | 8 -------- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 block/partitions/sgi.h diff --git a/block/partitions/sgi.c b/block/partitions/sgi.c index d7b421c6e530..927cf501603e 100644 --- a/block/partitions/sgi.c +++ b/block/partitions/sgi.c @@ -6,7 +6,8 @@ */ #include "check.h" -#include "sgi.h" + +#define SGI_LABEL_MAGIC 0x0be5a941 struct sgi_disklabel { __be32 magic_mushroom; /* Big fat spliff... */ diff --git a/block/partitions/sgi.h b/block/partitions/sgi.h deleted file mode 100644 index 372cdad19fea..000000000000 --- a/block/partitions/sgi.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * fs/partitions/sgi.h - */ - - -#define SGI_LABEL_MAGIC 0x0be5a941 - -- 2.24.1