X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fpartitions%2Fcheck.c;fp=fs%2Fpartitions%2Fcheck.c;h=2ef03aa542ff55e33af5b43c480d75a8fa0c0c35;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=51c6a748df4921947659abb114fc189f2508fa95;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 51c6a748d..2ef03aa54 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -18,8 +18,10 @@ #include #include #include +#include #include "check.h" +#include "devfs.h" #include "acorn.h" #include "amiga.h" @@ -159,11 +161,18 @@ check_partition(struct gendisk *hd, struct block_device *bdev) if (!state) return NULL; - disk_name(hd, 0, state->name); - printk(KERN_INFO " %s:", state->name); - if (isdigit(state->name[strlen(state->name)-1])) +#ifdef CONFIG_DEVFS_FS + if (hd->devfs_name[0] != '\0') { + printk(KERN_INFO " /dev/%s:", hd->devfs_name); sprintf(state->name, "p"); - + } +#endif + else { + disk_name(hd, 0, state->name); + printk(KERN_INFO " %s:", state->name); + if (isdigit(state->name[strlen(state->name)-1])) + sprintf(state->name, "p"); + } state->limit = hd->minors; i = res = 0; while (!res && check_part[i]) { @@ -288,25 +297,6 @@ struct kobj_type ktype_part = { .sysfs_ops = &part_sysfs_ops, }; -static inline void partition_sysfs_add_subdir(struct hd_struct *p) -{ - struct kobject *k; - - k = kobject_get(&p->kobj); - p->holder_dir = kobject_add_dir(k, "holders"); - kobject_put(k); -} - -static inline void disk_sysfs_add_subdirs(struct gendisk *disk) -{ - struct kobject *k; - - k = kobject_get(&disk->kobj); - disk->holder_dir = kobject_add_dir(k, "holders"); - disk->slave_dir = kobject_add_dir(k, "slaves"); - kobject_put(k); -} - void delete_partition(struct gendisk *disk, int part) { struct hd_struct *p = disk->part[part-1]; @@ -319,12 +309,8 @@ void delete_partition(struct gendisk *disk, int part) p->nr_sects = 0; p->ios[0] = p->ios[1] = 0; p->sectors[0] = p->sectors[1] = 0; - sysfs_remove_link(&p->kobj, "subsystem"); - if (p->holder_dir) - kobject_unregister(p->holder_dir); - kobject_uevent(&p->kobj, KOBJ_REMOVE); - kobject_del(&p->kobj); - kobject_put(&p->kobj); + devfs_remove("%s/part%d", disk->devfs_name, part); + kobject_unregister(&p->kobj); } void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len) @@ -339,7 +325,10 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len) p->start_sect = start; p->nr_sects = len; p->partno = part; - p->policy = disk->policy; + + devfs_mk_bdev(MKDEV(disk->major, disk->first_minor + part), + S_IFBLK|S_IRUSR|S_IWUSR, + "%s/part%d", disk->devfs_name, part); if (isdigit(disk->kobj.name[strlen(disk->kobj.name)-1])) snprintf(p->kobj.name,KOBJ_NAME_LEN,"%sp%d",disk->kobj.name,part); @@ -347,12 +336,7 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len) snprintf(p->kobj.name,KOBJ_NAME_LEN,"%s%d",disk->kobj.name,part); p->kobj.parent = &disk->kobj; p->kobj.ktype = &ktype_part; - kobject_init(&p->kobj); - kobject_add(&p->kobj); - if (!disk->part_uevent_suppress) - kobject_uevent(&p->kobj, KOBJ_ADD); - sysfs_create_link(&p->kobj, &block_subsys.kset.kobj, "subsystem"); - partition_sysfs_add_subdir(p); + kobject_register(&p->kobj); disk->part[part-1] = p; } @@ -387,7 +371,6 @@ static void disk_sysfs_symlinks(struct gendisk *disk) kfree(disk_name); } } - sysfs_create_link(&disk->kobj, &block_subsys.kset.kobj, "subsystem"); } /* Not exported, helper to add_disk(). */ @@ -395,8 +378,6 @@ void register_disk(struct gendisk *disk) { struct block_device *bdev; char *s; - int i; - struct hd_struct *p; int err; strlcpy(disk->kobj.name,disk->disk_name,KOBJ_NAME_LEN); @@ -407,40 +388,30 @@ void register_disk(struct gendisk *disk) if ((err = kobject_add(&disk->kobj))) return; disk_sysfs_symlinks(disk); - disk_sysfs_add_subdirs(disk); + kobject_uevent(&disk->kobj, KOBJ_ADD); /* No minors to use for partitions */ - if (disk->minors == 1) - goto exit; + if (disk->minors == 1) { + if (disk->devfs_name[0] != '\0') + devfs_add_disk(disk); + return; + } + + /* always add handle for the whole disk */ + devfs_add_partitioned(disk); /* No such device (e.g., media were just removed) */ if (!get_capacity(disk)) - goto exit; + return; bdev = bdget_disk(disk, 0); if (!bdev) - goto exit; + return; - /* scan partition table, but suppress uevents */ bdev->bd_invalidated = 1; - disk->part_uevent_suppress = 1; - err = blkdev_get(bdev, FMODE_READ, 0); - disk->part_uevent_suppress = 0; - if (err < 0) - goto exit; + if (blkdev_get(bdev, FMODE_READ, 0) < 0) + return; blkdev_put(bdev); - -exit: - /* announce disk after possible partitions are already created */ - kobject_uevent(&disk->kobj, KOBJ_ADD); - - /* announce possible partitions */ - for (i = 1; i < disk->minors; i++) { - p = disk->part[i-1]; - if (!p || !p->nr_sects) - continue; - kobject_uevent(&p->kobj, KOBJ_ADD); - } } int rescan_partitions(struct gendisk *disk, struct block_device *bdev) @@ -465,10 +436,6 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev) sector_t from = state->parts[p].from; if (!size) continue; - if (from + size > get_capacity(disk)) { - printk(" %s: p%d exceeds device capacity\n", - disk->disk_name, p); - } add_partition(disk, p, from, size); #ifdef CONFIG_BLK_DEV_MD if (state->parts[p].flags) @@ -484,8 +451,8 @@ unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p) struct address_space *mapping = bdev->bd_inode->i_mapping; struct page *page; - page = read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)), - NULL); + page = read_cache_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)), + (filler_t *)mapping->a_ops->readpage, NULL); if (!IS_ERR(page)) { wait_on_page_locked(page); if (!PageUptodate(page)) @@ -519,11 +486,8 @@ void del_gendisk(struct gendisk *disk) disk_stat_set_all(disk, 0); disk->stamp = 0; - kobject_uevent(&disk->kobj, KOBJ_REMOVE); - if (disk->holder_dir) - kobject_unregister(disk->holder_dir); - if (disk->slave_dir) - kobject_unregister(disk->slave_dir); + devfs_remove_disk(disk); + if (disk->driverfs_dev) { char *disk_name = make_block_name(disk); sysfs_remove_link(&disk->kobj, "device"); @@ -532,8 +496,7 @@ void del_gendisk(struct gendisk *disk) kfree(disk_name); } put_device(disk->driverfs_dev); - disk->driverfs_dev = NULL; } - sysfs_remove_link(&disk->kobj, "subsystem"); + kobject_uevent(&disk->kobj, KOBJ_REMOVE); kobject_del(&disk->kobj); }