Commit 1442f76d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move struct partition out of genhd.h 



struct partition is the on-disk format of a MSDOS partition table entry.
Move it out of genhd.h into a new msdos_partition.h header and give it
a msdos_ prefix to avoid confusion.
Also move the magic number from block/partitions/msdos.h to the new
header so that it can be used by the SCSI drivers looking at the DOS
partition tables.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cbb5cb3b

block/partitions/ldm.c

+3 −3
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ 
#include <linux/stringify.h>

#include <linux/kernel.h>

#include <linux/uuid.h>

#include <linux/msdos_partition.h>



#include "ldm.h"

#include "check.h"

#include "msdos.h"



/*

 * ldm_debug/info/error/crit - Output an error message
@@ -493,7 +493,7 @@ static bool ldm_validate_partition_table(struct parsed_partitions *state) 
{

	Sector sect;

	u8 *data;

	struct partition *p;

	struct msdos_partition *p;

	int i;

	bool result = false;
@@ -508,7 +508,7 @@ static bool ldm_validate_partition_table(struct parsed_partitions *state) 
	if (*(__le16*) (data + 0x01FE) != cpu_to_le16 (MSDOS_LABEL_MAGIC))

		goto out;



	p = (struct partition*)(data + 0x01BE);

	p = (struct msdos_partition *)(data + 0x01BE);

	for (i = 0; i < 4; i++, p++)

		if (SYS_IND (p) == LDM_PARTITION) {

			result = true;

block/partitions/msdos.c

+14 −14
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
 *  Re-organised Feb 1998 Russell King

 */

#include <linux/msdos_fs.h>

#include <linux/msdos_partition.h>



#include "check.h"

#include "msdos.h"

#include "efi.h"



/*
@@ -34,17 +34,17 @@ 


#define SYS_IND(p)	get_unaligned(&p->sys_ind)



static inline sector_t nr_sects(struct partition *p)

static inline sector_t nr_sects(struct msdos_partition *p)

{

	return (sector_t)get_unaligned_le32(&p->nr_sects);

}



static inline sector_t start_sect(struct partition *p)

static inline sector_t start_sect(struct msdos_partition *p)

{

	return (sector_t)get_unaligned_le32(&p->start_sect);

}



static inline int is_extended_partition(struct partition *p)

static inline int is_extended_partition(struct msdos_partition *p)

{

	return (SYS_IND(p) == DOS_EXTENDED_PARTITION ||

		SYS_IND(p) == WIN98_EXTENDED_PARTITION ||
@@ -67,7 +67,7 @@ msdos_magic_present(unsigned char *p) 
#define AIX_LABEL_MAGIC4	0xC1

static int aix_magic_present(struct parsed_partitions *state, unsigned char *p)

{

	struct partition *pt = (struct partition *) (p + 0x1be);

	struct msdos_partition *pt = (struct msdos_partition *) (p + 0x1be);

	Sector sect;

	unsigned char *d;

	int slot, ret = 0;
@@ -121,7 +121,7 @@ static void parse_extended(struct parsed_partitions *state, 
			   sector_t first_sector, sector_t first_size,

			   u32 disksig)

{

	struct partition *p;

	struct msdos_partition *p;

	Sector sect;

	unsigned char *data;

	sector_t this_sector, this_size;
@@ -145,7 +145,7 @@ static void parse_extended(struct parsed_partitions *state, 
		if (!msdos_magic_present(data + 510))

			goto done;



		p = (struct partition *) (data + 0x1be);

		p = (struct msdos_partition *) (data + 0x1be);



		/*

		 * Usually, the first entry is the real data partition,
@@ -402,14 +402,14 @@ static void parse_minix(struct parsed_partitions *state, 
#ifdef CONFIG_MINIX_SUBPARTITION

	Sector sect;

	unsigned char *data;

	struct partition *p;

	struct msdos_partition *p;

	int i;



	data = read_part_sector(state, offset, &sect);

	if (!data)

		return;



	p = (struct partition *)(data + 0x1be);

	p = (struct msdos_partition *)(data + 0x1be);



	/* The first sector of a Minix partition can have either

	 * a secondary MBR describing its subpartitions, or
@@ -453,7 +453,7 @@ int msdos_partition(struct parsed_partitions *state) 
	sector_t sector_size = bdev_logical_block_size(state->bdev) / 512;

	Sector sect;

	unsigned char *data;

	struct partition *p;

	struct msdos_partition *p;

	struct fat_boot_sector *fb;

	int slot;

	u32 disksig;
@@ -487,7 +487,7 @@ int msdos_partition(struct parsed_partitions *state) 
	 * partition table. Reject this in case the boot indicator

	 * is not 0 or 0x80.

	 */

	p = (struct partition *) (data + 0x1be);

	p = (struct msdos_partition *) (data + 0x1be);

	for (slot = 1; slot <= 4; slot++, p++) {

		if (p->boot_ind != 0 && p->boot_ind != 0x80) {

			/*
@@ -509,7 +509,7 @@ int msdos_partition(struct parsed_partitions *state) 
	}



#ifdef CONFIG_EFI_PARTITION

	p = (struct partition *) (data + 0x1be);

	p = (struct msdos_partition *) (data + 0x1be);

	for (slot = 1 ; slot <= 4 ; slot++, p++) {

		/* If this is an EFI GPT disk, msdos should ignore it. */

		if (SYS_IND(p) == EFI_PMBR_OSTYPE_EFI_GPT) {
@@ -518,7 +518,7 @@ int msdos_partition(struct parsed_partitions *state) 
		}

	}

#endif

	p = (struct partition *) (data + 0x1be);

	p = (struct msdos_partition *) (data + 0x1be);



	disksig = le32_to_cpup((__le32 *)(data + 0x1b8));
@@ -565,7 +565,7 @@ int msdos_partition(struct parsed_partitions *state) 
	strlcat(state->pp_buf, "\n", PAGE_SIZE);



	/* second pass - output for each on a separate line */

	p = (struct partition *) (0x1be + data);

	p = (struct msdos_partition *) (0x1be + data);

	for (slot = 1 ; slot <= 4 ; slot++, p++) {

		unsigned char id = SYS_IND(p);

		int n;

block/partitions/msdos.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 *  fs/partitions/msdos.h

 */



#define MSDOS_LABEL_MAGIC		0xAA55

drivers/scsi/BusLogic.c

+5 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/jiffies.h>

#include <linux/dma-mapping.h>

#include <linux/slab.h>

#include <linux/msdos_partition.h>

#include <scsi/scsicam.h>



#include <asm/dma.h>
@@ -3410,9 +3411,10 @@ static int blogic_diskparam(struct scsi_device *sdev, struct block_device *dev, 
	   a partition table entry whose end_head matches one of the

	   standard BusLogic geometry translations (64/32, 128/32, or 255/63).

	 */

	if (*(unsigned short *) (buf + 64) == 0xAA55) {

		struct partition *part1_entry = (struct partition *) buf;

		struct partition *part_entry = part1_entry;

	if (*(unsigned short *) (buf + 64) == MSDOS_LABEL_MAGIC) {

		struct msdos_partition *part1_entry =

				(struct msdos_partition *)buf;

		struct msdos_partition *part_entry = part1_entry;

		int saved_cyl = diskparam->cylinders, part_no;

		unsigned char part_end_head = 0, part_end_sector = 0;

drivers/scsi/aacraid/linit.c

+4 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/syscalls.h>

#include <linux/delay.h>

#include <linux/kthread.h>

#include <linux/msdos_partition.h>



#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>
@@ -328,9 +329,9 @@ static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev, 
	buf = scsi_bios_ptable(bdev);

	if (!buf)

		return 0;

	if(*(__le16 *)(buf + 0x40) == cpu_to_le16(0xaa55)) {

		struct partition *first = (struct partition * )buf;

		struct partition *entry = first;

	if (*(__le16 *)(buf + 0x40) == cpu_to_le16(MSDOS_LABEL_MAGIC)) {

		struct msdos_partition *first = (struct msdos_partition *)buf;

		struct msdos_partition *entry = first;

		int saved_cylinders = param->cylinders;

		int num;

		unsigned char end_head, end_sec;

CRA Git | Maintained and supported by SUSTech CRA and CCSE