This patch makes the following misc updates in preparation for
extended block devt support.
* make add_partition report on failrues
* add hd_struct->disk which points to the containing gendisk
* fix comment for gendisk->part
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
---
fs/partitions/check.c | 11 ++++++++++-
include/linux/genhd.h | 3 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 6149e4b..b915ac2 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -346,19 +346,28 @@ static DEVICE_ATTR(whole_disk, S_IRUSR | S_IRGRP | S_IROTH,
void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len, int flags)
{
+ char name[BDEVNAME_SIZE];
struct hd_struct *p;
int err;
+ disk_name(disk, part, name);
+
p = kzalloc(sizeof(*p), GFP_KERNEL);
- if (!p)
+ if (!p) {
+ printk(KERN_WARNING "%s: failed to allocate partition "
+ "structure (part=%d)\n", name, part);
return;
+ }
if (!init_part_stats(p)) {
+ printk(KERN_WARNING "%s: failed to initialize partition stats "
+ "structure (part=%d)\n", name, part);
kfree(p);
return;
}
p->start_sect = start;
p->nr_sects = len;
+ p->disk = disk;
p->partno = part;
p->policy = disk->policy;
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index ae7aec3..1f06681 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -88,6 +88,7 @@ struct hd_struct {
sector_t start_sect;
sector_t nr_sects;
struct device dev;
+ struct gendisk *disk;
struct kobject *holder_dir;
int policy, partno;
#ifdef CONFIG_FAIL_MAKE_REQUEST
@@ -117,7 +118,7 @@ struct gendisk {
int minors; /* maximum number of minors, =1 for
* disks that can't be partitioned. */
char disk_name[32]; /* name of major driver */
- struct hd_struct **part; /* [indexed by minor] */
+ struct hd_struct **part; /* [indexed by minor - 1] */
struct block_device_operations *fops;
struct request_queue *queue;
void *private_data;
--
1.5.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
