diff options
Diffstat (limited to 'target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch')
| -rw-r--r-- | target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch | 46 |
1 files changed, 11 insertions, 35 deletions
diff --git a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch b/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch index b31479e5ac..96c89f41c4 100644 --- a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch +++ b/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch @@ -17,11 +17,9 @@ Subject: [PATCH] kernel: add block fit partition parser include/linux/msdos_partition.h | 1 + 11 files changed, 57 insertions(+) -diff --git a/block/blk.h b/block/blk.h -index aab72194d226..ed23a4fac950 100644 --- a/block/blk.h +++ b/block/blk.h -@@ -354,6 +354,8 @@ void blk_free_ext_minor(unsigned int minor); +@@ -354,6 +354,8 @@ void blk_free_ext_minor(unsigned int min #define ADDPART_FLAG_NONE 0 #define ADDPART_FLAG_RAID 1 #define ADDPART_FLAG_WHOLEDISK 2 @@ -30,8 +28,6 @@ index aab72194d226..ed23a4fac950 100644 int bdev_add_partition(struct gendisk *disk, int partno, sector_t start, sector_t length); int bdev_del_partition(struct gendisk *disk, int partno); -diff --git a/block/partitions/Kconfig b/block/partitions/Kconfig -index 278593b8e4e9..d4cd2f36ea95 100644 --- a/block/partitions/Kconfig +++ b/block/partitions/Kconfig @@ -101,6 +101,13 @@ config ATARI_PARTITION @@ -48,8 +44,6 @@ index 278593b8e4e9..d4cd2f36ea95 100644 config IBM_PARTITION bool "IBM disk label and partition support" depends on PARTITION_ADVANCED && S390 -diff --git a/block/partitions/Makefile b/block/partitions/Makefile -index a7f05cdb02a8..d319eb1deba9 100644 --- a/block/partitions/Makefile +++ b/block/partitions/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_ACORN_PARTITION) += acorn.o @@ -60,11 +54,9 @@ index a7f05cdb02a8..d319eb1deba9 100644 obj-$(CONFIG_CMDLINE_PARTITION) += cmdline.o obj-$(CONFIG_MAC_PARTITION) += mac.o obj-$(CONFIG_LDM_PARTITION) += ldm.o -diff --git a/block/partitions/check.h b/block/partitions/check.h -index d5b28e309d64..1b2fd18b2480 100644 --- a/block/partitions/check.h +++ b/block/partitions/check.h -@@ -58,6 +58,7 @@ int amiga_partition(struct parsed_partitions *state); +@@ -58,6 +58,7 @@ int amiga_partition(struct parsed_partit int atari_partition(struct parsed_partitions *state); int cmdline_partition(struct parsed_partitions *state); int efi_partition(struct parsed_partitions *state); @@ -72,14 +64,12 @@ index d5b28e309d64..1b2fd18b2480 100644 int ibm_partition(struct parsed_partitions *); int karma_partition(struct parsed_partitions *state); int ldm_partition(struct parsed_partitions *state); -@@ -68,3 +69,5 @@ int sgi_partition(struct parsed_partitions *state); +@@ -68,3 +69,5 @@ int sgi_partition(struct parsed_partitio int sun_partition(struct parsed_partitions *state); int sysv68_partition(struct parsed_partitions *state); int ultrix_partition(struct parsed_partitions *state); + +int parse_fit_partitions(struct parsed_partitions *state, u64 start_sector, u64 nr_sectors, int *slot, int add_remain); -diff --git a/block/partitions/core.c b/block/partitions/core.c -index b9e9af84f518..176f7fe79c56 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -12,6 +12,10 @@ @@ -93,7 +83,7 @@ index b9e9af84f518..176f7fe79c56 100644 #include "check.h" static int (*check_part[])(struct parsed_partitions *) = { -@@ -48,6 +52,9 @@ static int (*check_part[])(struct parsed_partitions *) = { +@@ -48,6 +52,9 @@ static int (*check_part[])(struct parsed #ifdef CONFIG_EFI_PARTITION efi_partition, /* this must come before msdos */ #endif @@ -103,7 +93,7 @@ index b9e9af84f518..176f7fe79c56 100644 #ifdef CONFIG_SGI_PARTITION sgi_partition, #endif -@@ -408,6 +415,11 @@ static struct block_device *add_partition(struct gendisk *disk, int partno, +@@ -408,6 +415,11 @@ static struct block_device *add_partitio goto out_del; } @@ -115,7 +105,7 @@ index b9e9af84f518..176f7fe79c56 100644 /* everything is up and running, commence */ err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL); if (err) -@@ -598,6 +610,11 @@ static bool blk_add_partition(struct gendisk *disk, +@@ -598,6 +610,11 @@ static bool blk_add_partition(struct gen (state->parts[p].flags & ADDPART_FLAG_RAID)) md_autodetect_dev(part->bd_dev); @@ -127,11 +117,9 @@ index b9e9af84f518..176f7fe79c56 100644 return true; } -diff --git a/block/partitions/efi.c b/block/partitions/efi.c -index 7ca5c4c374d4..9ecd2b3d5674 100644 --- a/block/partitions/efi.c +++ b/block/partitions/efi.c -@@ -716,6 +716,9 @@ int efi_partition(struct parsed_partitions *state) +@@ -716,6 +716,9 @@ int efi_partition(struct parsed_partitio gpt_entry *ptes = NULL; u32 i; unsigned ssz = queue_logical_block_size(state->disk->queue) / 512; @@ -141,7 +129,7 @@ index 7ca5c4c374d4..9ecd2b3d5674 100644 if (!find_valid_gpt(state, &gpt, &ptes) || !gpt || !ptes) { kfree(gpt); -@@ -749,6 +752,11 @@ int efi_partition(struct parsed_partitions *state) +@@ -749,6 +752,11 @@ int efi_partition(struct parsed_partitio ARRAY_SIZE(ptes[i].partition_name)); utf16_le_to_7bit(ptes[i].partition_name, label_max, info->volname); state->parts[i + 1].has_info = true; @@ -153,8 +141,6 @@ index 7ca5c4c374d4..9ecd2b3d5674 100644 } kfree(ptes); kfree(gpt); -diff --git a/block/partitions/efi.h b/block/partitions/efi.h -index 8cc2b88d0aa8..b5807e35bafc 100644 --- a/block/partitions/efi.h +++ b/block/partitions/efi.h @@ -52,6 +52,9 @@ @@ -167,11 +153,9 @@ index 8cc2b88d0aa8..b5807e35bafc 100644 typedef struct _gpt_header { __le64 signature; -diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c -index b5d5c229cc3b..ff7e74911359 100644 --- a/block/partitions/msdos.c +++ b/block/partitions/msdos.c -@@ -564,6 +564,15 @@ static void parse_minix(struct parsed_partitions *state, +@@ -564,6 +564,15 @@ static void parse_minix(struct parsed_pa #endif /* CONFIG_MINIX_SUBPARTITION */ } @@ -195,11 +179,9 @@ index b5d5c229cc3b..ff7e74911359 100644 {0, NULL}, }; -diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c -index 65470d1b8fc8..5dd9b54d6555 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c -@@ -345,6 +345,8 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) +@@ -345,6 +345,8 @@ int add_mtd_blktrans_dev(struct mtd_blkt gd->first_minor = (new->devnum) << tr->part_bits; gd->minors = 1 << tr->part_bits; gd->fops = &mtd_block_ops; @@ -208,11 +190,9 @@ index 65470d1b8fc8..5dd9b54d6555 100644 if (tr->part_bits) if (new->devnum < 26) -diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c -index 57b984dd73b4..5982070e470b 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c -@@ -428,6 +428,9 @@ int ubiblock_create(struct ubi_volume_info *vi) +@@ -428,6 +428,9 @@ int ubiblock_create(struct ubi_volume_in goto out_cleanup_disk; } gd->private_data = dev; @@ -222,8 +202,6 @@ index 57b984dd73b4..5982070e470b 100644 sprintf(gd->disk_name, "ubiblock%d_%d", dev->ubi_num, dev->vol_id); set_capacity(gd, disk_capacity); dev->gd = gd; -diff --git a/include/linux/msdos_partition.h b/include/linux/msdos_partition.h -index 2cb82db2a43c..c15b6c759aca 100644 --- a/include/linux/msdos_partition.h +++ b/include/linux/msdos_partition.h @@ -31,6 +31,7 @@ enum msdos_sys_ind { @@ -234,5 +212,3 @@ index 2cb82db2a43c..c15b6c759aca 100644 SOLARIS_X86_PARTITION = 0x82, /* also Linux swap partitions */ NEW_SOLARIS_X86_PARTITION = 0xbf, --- - |