aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorWill Drewry <wad@chromium.org>2010-08-31 15:47:05 -0500
committerJens Axboe <jaxboe@fusionio.com>2010-09-15 16:13:18 +0200
commit6d1d8050b4bc89d0165d29b58e894aeba2564a97 (patch)
treeb5c5b730bd7b80fe9041c031a6fcf08f42fff0d5 /block
parent144177991ca624841ddbd1e7edff958fc0f6d1fe (diff)
downloadmrst-s0i3-test-6d1d8050b4bc89d0165d29b58e894aeba2564a97.tar.gz
mrst-s0i3-test-6d1d8050b4bc89d0165d29b58e894aeba2564a97.tar.xz
mrst-s0i3-test-6d1d8050b4bc89d0165d29b58e894aeba2564a97.zip
block, partition: add partition_meta_info to hd_struct
I'm reposting this patch series as v4 since there have been no additional comments, and I cleaned up one extra bit of unneeded code (in 3/3). The patches are against Linus's tree: 2bfc96a127bc1cc94d26bfaa40159966064f9c8c (2.6.36-rc3). Would this patchset be suitable for inclusion in an mm branch? This changes adds a partition_meta_info struct which itself contains a union of structures that provide partition table specific metadata. This change leaves the union empty. The subsequent patch includes an implementation for CONFIG_EFI_PARTITION-based metadata. Signed-off-by: Will Drewry <wad@chromium.org> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block')
-rw-r--r--block/genhd.c1
-rw-r--r--block/ioctl.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 59a2db6fece..c8da1205526 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1004,6 +1004,7 @@ static void disk_release(struct device *dev)
kfree(disk->random);
disk_replace_part_tbl(disk, NULL);
free_part_stats(&disk->part0);
+ free_part_info(&disk->part0);
kfree(disk);
}
struct class block_class = {
diff --git a/block/ioctl.c b/block/ioctl.c
index d8052f0dabd..2c15fe0912c 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -62,7 +62,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
/* all seems OK */
part = add_partition(disk, partno, start, length,
- ADDPART_FLAG_NONE);
+ ADDPART_FLAG_NONE, NULL);
mutex_unlock(&bdev->bd_mutex);
return IS_ERR(part) ? PTR_ERR(part) : 0;
case BLKPG_DEL_PARTITION: