Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Christoph Hellwig and committed by
Jens Axboe
3f1b95ef ffa9ed64

+22 -75
-1
block/partitions/acorn.c
··· 11 11 #include <linux/adfs_fs.h> 12 12 13 13 #include "check.h" 14 - #include "acorn.h" 15 14 16 15 /* 17 16 * Partition types. (Oh for reusability)
-15
block/partitions/acorn.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - /* 3 - * linux/fs/partitions/acorn.h 4 - * 5 - * Copyright (C) 1996-2001 Russell King. 6 - * 7 - * I _hate_ this partitioning mess - why can't we have one defined 8 - * format, and everyone stick to it? 9 - */ 10 - 11 - int adfspart_check_CUMANA(struct parsed_partitions *state); 12 - int adfspart_check_ADFS(struct parsed_partitions *state); 13 - int adfspart_check_ICS(struct parsed_partitions *state); 14 - int adfspart_check_POWERTEC(struct parsed_partitions *state); 15 - int adfspart_check_EESOX(struct parsed_partitions *state);
-1
block/partitions/aix.c
··· 6 6 */ 7 7 8 8 #include "check.h" 9 - #include "aix.h" 10 9 11 10 struct lvm_rec { 12 11 char lvm_id[4]; /* "_LVM" */
-2
block/partitions/aix.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - extern int aix_partition(struct parsed_partitions *state);
-1
block/partitions/amiga.c
··· 14 14 #include <linux/affs_hardblocks.h> 15 15 16 16 #include "check.h" 17 - #include "amiga.h" 18 17 19 18 static __inline__ u32 20 19 checksum_block(__be32 *m, int size)
-7
block/partitions/amiga.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - /* 3 - * fs/partitions/amiga.h 4 - */ 5 - 6 - int amiga_partition(struct parsed_partitions *state); 7 -
-1
block/partitions/atari.h
··· 34 34 u16 checksum; /* checksum for bootable disks */ 35 35 } __packed; 36 36 37 - int atari_partition(struct parsed_partitions *state);
-16
block/partitions/check.c
··· 21 21 22 22 #include "check.h" 23 23 24 - #include "acorn.h" 25 - #include "amiga.h" 26 - #include "atari.h" 27 - #include "ldm.h" 28 - #include "mac.h" 29 - #include "msdos.h" 30 - #include "osf.h" 31 - #include "sgi.h" 32 - #include "sun.h" 33 - #include "ibm.h" 34 - #include "ultrix.h" 35 - #include "efi.h" 36 - #include "karma.h" 37 - #include "sysv68.h" 38 - #include "cmdline.h" 39 - 40 24 static int (*check_part[])(struct parsed_partitions *) = { 41 25 /* 42 26 * Probe partition formats with tables at disk address 0
+22
block/partitions/check.h
··· 50 50 strlcat(p->pp_buf, tmp, PAGE_SIZE); 51 51 } 52 52 } 53 + 54 + /* detection routines go here in alphabetical order: */ 55 + int adfspart_check_ADFS(struct parsed_partitions *state); 56 + int adfspart_check_CUMANA(struct parsed_partitions *state); 57 + int adfspart_check_EESOX(struct parsed_partitions *state); 58 + int adfspart_check_ICS(struct parsed_partitions *state); 59 + int adfspart_check_POWERTEC(struct parsed_partitions *state); 60 + int aix_partition(struct parsed_partitions *state); 61 + int amiga_partition(struct parsed_partitions *state); 62 + int atari_partition(struct parsed_partitions *state); 63 + int cmdline_partition(struct parsed_partitions *state); 64 + int efi_partition(struct parsed_partitions *state); 65 + int ibm_partition(struct parsed_partitions *); 66 + int karma_partition(struct parsed_partitions *state); 67 + int ldm_partition(struct parsed_partitions *state); 68 + int mac_partition(struct parsed_partitions *state); 69 + int msdos_partition(struct parsed_partitions *state); 70 + int osf_partition(struct parsed_partitions *state); 71 + int sgi_partition(struct parsed_partitions *state); 72 + int sun_partition(struct parsed_partitions *state); 73 + int sysv68_partition(struct parsed_partitions *state); 74 + int ultrix_partition(struct parsed_partitions *state);
-1
block/partitions/cmdline.c
··· 18 18 #include <linux/cmdline-parser.h> 19 19 20 20 #include "check.h" 21 - #include "cmdline.h" 22 21 23 22 static char *cmdline; 24 23 static struct cmdline_parts *bdev_parts;
-3
block/partitions/cmdline.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - 3 - int cmdline_partition(struct parsed_partitions *state);
-3
block/partitions/efi.h
··· 113 113 __le16 signature; 114 114 } __packed legacy_mbr; 115 115 116 - /* Functions */ 117 - extern int efi_partition(struct parsed_partitions *state); 118 - 119 116 #endif
-1
block/partitions/ibm.c
··· 15 15 #include <asm/vtoc.h> 16 16 17 17 #include "check.h" 18 - #include "ibm.h" 19 18 20 19 21 20 union label_t {
-2
block/partitions/ibm.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - int ibm_partition(struct parsed_partitions *);
-3
block/partitions/karma.h
··· 4 4 */ 5 5 6 6 #define KARMA_LABEL_MAGIC 0xAB56 7 - 8 - int karma_partition(struct parsed_partitions *state); 9 -
-2
block/partitions/ldm.h
··· 193 193 struct list_head v_part; 194 194 }; 195 195 196 - int ldm_partition(struct parsed_partitions *state); 197 - 198 196 #endif /* _FS_PT_LDM_H_ */ 199 197
-1
block/partitions/mac.h
··· 42 42 /* ... more stuff */ 43 43 }; 44 44 45 - int mac_partition(struct parsed_partitions *state);
-1
block/partitions/msdos.c
··· 24 24 #include "check.h" 25 25 #include "msdos.h" 26 26 #include "efi.h" 27 - #include "aix.h" 28 27 29 28 /* 30 29 * Many architectures don't like unaligned accesses, while
-1
block/partitions/msdos.h
··· 5 5 6 6 #define MSDOS_LABEL_MAGIC 0xAA55 7 7 8 - int msdos_partition(struct parsed_partitions *state); 9 8
-1
block/partitions/osf.h
··· 5 5 6 6 #define DISKLABELMAGIC (0x82564557UL) 7 7 8 - int osf_partition(struct parsed_partitions *state);
-1
block/partitions/sgi.h
··· 3 3 * fs/partitions/sgi.h 4 4 */ 5 5 6 - extern int sgi_partition(struct parsed_partitions *state); 7 6 8 7 #define SGI_LABEL_MAGIC 0x0be5a941 9 8
-1
block/partitions/sun.h
··· 6 6 #define SUN_LABEL_MAGIC 0xDABE 7 7 #define SUN_VTOC_SANITY 0x600DDEEE 8 8 9 - int sun_partition(struct parsed_partitions *state);
-1
block/partitions/sysv68.c
··· 6 6 */ 7 7 8 8 #include "check.h" 9 - #include "sysv68.h" 10 9 11 10 /* 12 11 * Volume ID structure: on first 256-bytes sector of disk
-2
block/partitions/sysv68.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - extern int sysv68_partition(struct parsed_partitions *state);
-1
block/partitions/ultrix.c
··· 8 8 */ 9 9 10 10 #include "check.h" 11 - #include "ultrix.h" 12 11 13 12 int ultrix_partition(struct parsed_partitions *state) 14 13 {
-6
block/partitions/ultrix.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - /* 3 - * fs/partitions/ultrix.h 4 - */ 5 - 6 - int ultrix_partition(struct parsed_partitions *state);