block: declare all partition detection routines in check.h

There is no good reason to include one header per partition type in
core.c.  Instead move the prototypes for the detection routins to
check.h, and remove all now empty headers in block/partitions/.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/partitions/acorn.c b/block/partitions/acorn.c
index 7587700fad4a3634bdb3ef9b4f1031cdf4f05f39..c64c57b958bf5fa60431d207592406f3b7122f2e 100644 (file)
--- a/block/partitions/acorn.c
+++ b/block/partitions/acorn.c
@@ -11,7 +11,6 @@
 #include <linux/adfs_fs.h>
 
 #include "check.h"
-#include "acorn.h"
 
 /*
  * Partition types. (Oh for reusability)

diff --git a/block/partitions/acorn.h b/block/partitions/acorn.h
deleted file mode 100644 (file)
index 67b0660..0000000
--- a/block/partitions/acorn.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * linux/fs/partitions/acorn.h
- *
- * Copyright (C) 1996-2001 Russell King.
- *
- *  I _hate_ this partitioning mess - why can't we have one defined
- *  format, and everyone stick to it?
- */
-
-int adfspart_check_CUMANA(struct parsed_partitions *state);
-int adfspart_check_ADFS(struct parsed_partitions *state);
-int adfspart_check_ICS(struct parsed_partitions *state);
-int adfspart_check_POWERTEC(struct parsed_partitions *state);
-int adfspart_check_EESOX(struct parsed_partitions *state);

diff --git a/block/partitions/aix.c b/block/partitions/aix.c
index 903f3ed175d0263344fe33ecbe19dfaeffcb202e..c7b4fd1a4a97701cb4cf77896f6281d5333dc9c5 100644 (file)
--- a/block/partitions/aix.c
+++ b/block/partitions/aix.c
@@ -6,7 +6,6 @@
  */
 
 #include "check.h"
-#include "aix.h"
 
 struct lvm_rec {
        char lvm_id[4]; /* "_LVM" */

diff --git a/block/partitions/aix.h b/block/partitions/aix.h
deleted file mode 100644 (file)
index b4449f0..0000000
--- a/block/partitions/aix.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-extern int aix_partition(struct parsed_partitions *state);

diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c
index 7fecc760b78f9482145593792ef28a31025fa3f9..9526491d9aed13b25f345e59c5ae0796bbe7b811 100644 (file)
--- a/block/partitions/amiga.c
+++ b/block/partitions/amiga.c
@@ -14,7 +14,6 @@
 #include <linux/affs_hardblocks.h>
 
 #include "check.h"
-#include "amiga.h"
 
 static __inline__ u32
 checksum_block(__be32 *m, int size)

diff --git a/block/partitions/amiga.h b/block/partitions/amiga.h
deleted file mode 100644 (file)
index 7e63f4d..0000000
--- a/block/partitions/amiga.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *  fs/partitions/amiga.h
- */
-
-int amiga_partition(struct parsed_partitions *state);
-

diff --git a/block/partitions/atari.h b/block/partitions/atari.h
index 01c2b9457394c081283f3ad64bc51f4838174157..678202442fd3738b47df11cbd8bc1a967a697277 100644 (file)
--- a/block/partitions/atari.h
+++ b/block/partitions/atari.h
@@ -34,4 +34,3 @@ struct rootsector
   u16 checksum;                        /* checksum for bootable disks */
 } __packed;
 
-int atari_partition(struct parsed_partitions *state);

diff --git a/block/partitions/check.c b/block/partitions/check.c
index 8fe46881ef633816e1ad523c8ac9e6dff52b7c7e..944c478b6f0bc40e257cf80e93970317198bdda5 100644 (file)
--- a/block/partitions/check.c
+++ b/block/partitions/check.c
@@ -21,22 +21,6 @@
 
 #include "check.h"
 
-#include "acorn.h"
-#include "amiga.h"
-#include "atari.h"
-#include "ldm.h"
-#include "mac.h"
-#include "msdos.h"
-#include "osf.h"
-#include "sgi.h"
-#include "sun.h"
-#include "ibm.h"
-#include "ultrix.h"
-#include "efi.h"
-#include "karma.h"
-#include "sysv68.h"
-#include "cmdline.h"
-
 static int (*check_part[])(struct parsed_partitions *) = {
        /*
         * Probe partition formats with tables at disk address 0

diff --git a/block/partitions/check.h b/block/partitions/check.h
index 19852b494e9373de41eed261ee3da87d218c82e6..23e7adb79617c45c4b4bde2f08a5dc3cabdd1946 100644 (file)
--- a/block/partitions/check.h
+++ b/block/partitions/check.h
@@ -50,3 +50,25 @@ put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size)
                strlcat(p->pp_buf, tmp, PAGE_SIZE);
        }
 }
+
+/* detection routines go here in alphabetical order: */
+int adfspart_check_ADFS(struct parsed_partitions *state);
+int adfspart_check_CUMANA(struct parsed_partitions *state);
+int adfspart_check_EESOX(struct parsed_partitions *state);
+int adfspart_check_ICS(struct parsed_partitions *state);
+int adfspart_check_POWERTEC(struct parsed_partitions *state);
+int aix_partition(struct parsed_partitions *state);
+int amiga_partition(struct parsed_partitions *state);
+int atari_partition(struct parsed_partitions *state);
+int cmdline_partition(struct parsed_partitions *state);
+int efi_partition(struct parsed_partitions *state);
+int ibm_partition(struct parsed_partitions *);
+int karma_partition(struct parsed_partitions *state);
+int ldm_partition(struct parsed_partitions *state);
+int mac_partition(struct parsed_partitions *state);
+int msdos_partition(struct parsed_partitions *state);
+int osf_partition(struct parsed_partitions *state);
+int sgi_partition(struct parsed_partitions *state);
+int sun_partition(struct parsed_partitions *state);
+int sysv68_partition(struct parsed_partitions *state);
+int ultrix_partition(struct parsed_partitions *state);

diff --git a/block/partitions/cmdline.c b/block/partitions/cmdline.c
index f1edd54522495637c05655f0e4e353c03204bdd8..8f545c36cde46d81c11e1ea5d3d254f1b5d485eb 100644 (file)
--- a/block/partitions/cmdline.c
+++ b/block/partitions/cmdline.c
@@ -18,7 +18,6 @@
 #include <linux/cmdline-parser.h>
 
 #include "check.h"
-#include "cmdline.h"
 
 static char *cmdline;
 static struct cmdline_parts *bdev_parts;

diff --git a/block/partitions/cmdline.h b/block/partitions/cmdline.h
deleted file mode 100644 (file)
index e64a316..0000000
--- a/block/partitions/cmdline.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-
-int cmdline_partition(struct parsed_partitions *state);

diff --git a/block/partitions/efi.h b/block/partitions/efi.h
index 3e8576157575bfdc1d6f22c1a1ddde1ff12d757d..907bac5ce8f71fecc7033f623f0e5bf577cce210 100644 (file)
--- a/block/partitions/efi.h
+++ b/block/partitions/efi.h
@@ -113,7 +113,4 @@ typedef struct _legacy_mbr {
        __le16 signature;
 } __packed legacy_mbr;
 
-/* Functions */
-extern int efi_partition(struct parsed_partitions *state);
-
 #endif

diff --git a/block/partitions/ibm.c b/block/partitions/ibm.c
index a5d480f807f352522eda8388c1e292f9c13d7088..073faa6a69b8afca444e417a1f79729bf097c135 100644 (file)
--- a/block/partitions/ibm.c
+++ b/block/partitions/ibm.c
@@ -15,7 +15,6 @@
 #include <asm/vtoc.h>
 
 #include "check.h"
-#include "ibm.h"
 
 
 union label_t {

diff --git a/block/partitions/ibm.h b/block/partitions/ibm.h
deleted file mode 100644 (file)
index 8bf13fe..0000000
--- a/block/partitions/ibm.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-int ibm_partition(struct parsed_partitions *);

diff --git a/block/partitions/karma.h b/block/partitions/karma.h
index 48e074d417fb6c1d24d48f356a082ff0349bbff7..1b5eec57ee0c3287e14da0b285d92f091336e847 100644 (file)
--- a/block/partitions/karma.h
+++ b/block/partitions/karma.h
@@ -4,6 +4,3 @@
  */
 
 #define KARMA_LABEL_MAGIC              0xAB56
-
-int karma_partition(struct parsed_partitions *state);
-

diff --git a/block/partitions/ldm.h b/block/partitions/ldm.h
index 1ca63e97bcccf96699489c84431c732c5044612b..841580af7f9bd3487d7e5ad6f8e7eb210b149e3e 100644 (file)
--- a/block/partitions/ldm.h
+++ b/block/partitions/ldm.h
@@ -193,7 +193,5 @@ struct ldmdb {                              /* Cache of the database */
        struct list_head v_part;
 };
 
-int ldm_partition(struct parsed_partitions *state);
-
 #endif /* _FS_PT_LDM_H_ */
 

diff --git a/block/partitions/mac.h b/block/partitions/mac.h
index 453ed2964804f1ece892d707b728d80e4bd92403..0e41c9da75328b077196d5c7b223aab8e029fb9a 100644 (file)
--- a/block/partitions/mac.h
+++ b/block/partitions/mac.h
@@ -42,4 +42,3 @@ struct mac_driver_desc {
     /* ... more stuff */
 };
 
-int mac_partition(struct parsed_partitions *state);

diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c
index 82c44f7df91130fd7a8484f7162a110aaf875a75..c572022f378186631a6b7da09dd81d8b19c97653 100644 (file)
--- a/block/partitions/msdos.c
+++ b/block/partitions/msdos.c
@@ -24,7 +24,6 @@
 #include "check.h"
 #include "msdos.h"
 #include "efi.h"
-#include "aix.h"
 
 /*
  * Many architectures don't like unaligned accesses, while

diff --git a/block/partitions/msdos.h b/block/partitions/msdos.h
index fcacfc48609213f69f23cf1bcda86e85a76f99ef..123e666bb932303c993a13ee796b80163ac36235 100644 (file)
--- a/block/partitions/msdos.h
+++ b/block/partitions/msdos.h
@@ -5,5 +5,4 @@
 
 #define MSDOS_LABEL_MAGIC              0xAA55
 
-int msdos_partition(struct parsed_partitions *state);
 

diff --git a/block/partitions/osf.h b/block/partitions/osf.h
index 4d8088e7ea8cc7dcf64932a2978de2e1c689671a..80a58c382b3f41cbf26624244f1360a33132d376 100644 (file)
--- a/block/partitions/osf.h
+++ b/block/partitions/osf.h
@@ -5,4 +5,3 @@
 
 #define DISKLABELMAGIC (0x82564557UL)
 
-int osf_partition(struct parsed_partitions *state);

diff --git a/block/partitions/sgi.h b/block/partitions/sgi.h
index a5b77c3987cf2c4947c092e0f31dd1bbcd96b7c4..372cdad19feaff226f2ea8602d006f1024a71baf 100644 (file)
--- a/block/partitions/sgi.h
+++ b/block/partitions/sgi.h
@@ -3,7 +3,6 @@
  *  fs/partitions/sgi.h
  */
 
-extern int sgi_partition(struct parsed_partitions *state);
 
 #define SGI_LABEL_MAGIC 0x0be5a941
 

diff --git a/block/partitions/sun.h b/block/partitions/sun.h
index ae1b9eed3fd73c7e4f181a4ad4f5383cbe7562fc..4c8877a5b52d3099c7cba72d4afd5fd9653c3730 100644 (file)
--- a/block/partitions/sun.h
+++ b/block/partitions/sun.h
@@ -6,4 +6,3 @@
 #define SUN_LABEL_MAGIC          0xDABE
 #define SUN_VTOC_SANITY          0x600DDEEE
 
-int sun_partition(struct parsed_partitions *state);

diff --git a/block/partitions/sysv68.c b/block/partitions/sysv68.c
index 92e810826b01f37eb6a666f8133767815878d89c..6f6257fd4eb4e9f05b96b844327a02f014711e42 100644 (file)
--- a/block/partitions/sysv68.c
+++ b/block/partitions/sysv68.c
@@ -6,7 +6,6 @@
  */
 
 #include "check.h"
-#include "sysv68.h"
 
 /*
  *     Volume ID structure: on first 256-bytes sector of disk

diff --git a/block/partitions/sysv68.h b/block/partitions/sysv68.h
deleted file mode 100644 (file)
index 4fb6b8e..0000000
--- a/block/partitions/sysv68.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-extern int sysv68_partition(struct parsed_partitions *state);

diff --git a/block/partitions/ultrix.c b/block/partitions/ultrix.c
index ecd0d7346c3dabf1af4f55dc68687e8aad9b5596..4aaa81043ca0a998e0becf89631071689ad13cee 100644 (file)
--- a/block/partitions/ultrix.c
+++ b/block/partitions/ultrix.c
@@ -8,7 +8,6 @@
  */
 
 #include "check.h"
-#include "ultrix.h"
 
 int ultrix_partition(struct parsed_partitions *state)
 {

diff --git a/block/partitions/ultrix.h b/block/partitions/ultrix.h
deleted file mode 100644 (file)
index 9f676ce..0000000
--- a/block/partitions/ultrix.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *  fs/partitions/ultrix.h
- */
-
-int ultrix_partition(struct parsed_partitions *state);