Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: declare all partition detection routines in check.h

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2020-03-24 08:25:21 +01:00 committed by Jens Axboe
parent ffa9ed647a
commit 3f1b95ef81
26 changed files with 22 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block/partitions/acorn.c
View File

@ -11,7 +11,6 @@
#include <linux/adfs_fs.h> #include <linux/adfs_fs.h>
#include "check.h" #include "check.h"
#include "acorn.h"
/* /*
* Partition types. (Oh for reusability) * Partition types. (Oh for reusability)

15
block/partitions/acorn.h
View File

@ -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);

1
block/partitions/aix.c
View File

@ -6,7 +6,6 @@
*/ */
#include "check.h" #include "check.h"
#include "aix.h"
struct lvm_rec { struct lvm_rec {
char lvm_id[4]; /* "_LVM" */ char lvm_id[4]; /* "_LVM" */

2
block/partitions/aix.h
View File

@ -1,2 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
extern int aix_partition(struct parsed_partitions *state);

1
block/partitions/amiga.c
View File

@ -14,7 +14,6 @@
#include <linux/affs_hardblocks.h> #include <linux/affs_hardblocks.h>
#include "check.h" #include "check.h"
#include "amiga.h"
static __inline__ u32 static __inline__ u32
checksum_block(__be32 *m, int size) checksum_block(__be32 *m, int size)

7
block/partitions/amiga.h
View File

@ -1,7 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* fs/partitions/amiga.h
*/
int amiga_partition(struct parsed_partitions *state);

1
block/partitions/atari.h
View File

@ -34,4 +34,3 @@ struct rootsector
u16 checksum; /* checksum for bootable disks */ u16 checksum; /* checksum for bootable disks */
} __packed; } __packed;
int atari_partition(struct parsed_partitions *state);

16
block/partitions/check.c
View File

@ -21,22 +21,6 @@
#include "check.h" #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 *) = { static int (*check_part[])(struct parsed_partitions *) = {
/* /*
* Probe partition formats with tables at disk address 0 * Probe partition formats with tables at disk address 0

22
block/partitions/check.h
View File

@ -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); 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);

1
block/partitions/cmdline.c
View File

@ -18,7 +18,6 @@
#include <linux/cmdline-parser.h> #include <linux/cmdline-parser.h>
#include "check.h" #include "check.h"
#include "cmdline.h"
static char *cmdline; static char *cmdline;
static struct cmdline_parts *bdev_parts; static struct cmdline_parts *bdev_parts;

3
block/partitions/cmdline.h
View File

@ -1,3 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
int cmdline_partition(struct parsed_partitions *state);

3
block/partitions/efi.h
View File

@ -113,7 +113,4 @@ typedef struct _legacy_mbr {
__le16 signature; __le16 signature;
} __packed legacy_mbr; } __packed legacy_mbr;
/* Functions */
extern int efi_partition(struct parsed_partitions *state);
#endif #endif

1
block/partitions/ibm.c
View File

@ -15,7 +15,6 @@
#include <asm/vtoc.h> #include <asm/vtoc.h>
#include "check.h" #include "check.h"
#include "ibm.h"
union label_t { union label_t {

2
block/partitions/ibm.h
View File

@ -1,2 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
int ibm_partition(struct parsed_partitions *);

3
block/partitions/karma.h
View File

@ -4,6 +4,3 @@
*/ */
#define KARMA_LABEL_MAGIC 0xAB56 #define KARMA_LABEL_MAGIC 0xAB56
int karma_partition(struct parsed_partitions *state);

2
block/partitions/ldm.h
View File

@ -193,7 +193,5 @@ struct ldmdb { /* Cache of the database */
struct list_head v_part; struct list_head v_part;
}; };
int ldm_partition(struct parsed_partitions *state);
#endif /* _FS_PT_LDM_H_ */ #endif /* _FS_PT_LDM_H_ */

1
block/partitions/mac.h
View File

@ -42,4 +42,3 @@ struct mac_driver_desc {
/* ... more stuff */ /* ... more stuff */
}; };
int mac_partition(struct parsed_partitions *state);

1
block/partitions/msdos.c
View File

@ -24,7 +24,6 @@
#include "check.h" #include "check.h"
#include "msdos.h" #include "msdos.h"
#include "efi.h" #include "efi.h"
#include "aix.h"
/* /*
* Many architectures don't like unaligned accesses, while * Many architectures don't like unaligned accesses, while

1
block/partitions/msdos.h
View File

@ -5,5 +5,4 @@
#define MSDOS_LABEL_MAGIC 0xAA55 #define MSDOS_LABEL_MAGIC 0xAA55
int msdos_partition(struct parsed_partitions *state);

1
block/partitions/osf.h
View File

@ -5,4 +5,3 @@
#define DISKLABELMAGIC (0x82564557UL) #define DISKLABELMAGIC (0x82564557UL)
int osf_partition(struct parsed_partitions *state);

1
block/partitions/sgi.h
View File

@ -3,7 +3,6 @@
* fs/partitions/sgi.h * fs/partitions/sgi.h
*/ */
extern int sgi_partition(struct parsed_partitions *state);
#define SGI_LABEL_MAGIC 0x0be5a941 #define SGI_LABEL_MAGIC 0x0be5a941

1
block/partitions/sun.h
View File

@ -6,4 +6,3 @@
#define SUN_LABEL_MAGIC 0xDABE #define SUN_LABEL_MAGIC 0xDABE
#define SUN_VTOC_SANITY 0x600DDEEE #define SUN_VTOC_SANITY 0x600DDEEE
int sun_partition(struct parsed_partitions *state);

1
block/partitions/sysv68.c
View File

@ -6,7 +6,6 @@
*/ */
#include "check.h" #include "check.h"
#include "sysv68.h"
/* /*
* Volume ID structure: on first 256-bytes sector of disk * Volume ID structure: on first 256-bytes sector of disk

2
block/partitions/sysv68.h
View File

@ -1,2 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
extern int sysv68_partition(struct parsed_partitions *state);

1
block/partitions/ultrix.c
View File

@ -8,7 +8,6 @@
*/ */
#include "check.h" #include "check.h"
#include "ultrix.h"
int ultrix_partition(struct parsed_partitions *state) int ultrix_partition(struct parsed_partitions *state)
{ {

6
block/partitions/ultrix.h
View File

@ -1,6 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* fs/partitions/ultrix.h
*/
int ultrix_partition(struct parsed_partitions *state);