mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge ../linux-2.6
This commit is contained in:
commit
bac30d1a78
779 changed files with 22983 additions and 7760 deletions
|
|
@ -297,6 +297,25 @@ 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];
|
||||
|
|
@ -310,6 +329,8 @@ void delete_partition(struct gendisk *disk, int part)
|
|||
p->ios[0] = p->ios[1] = 0;
|
||||
p->sectors[0] = p->sectors[1] = 0;
|
||||
devfs_remove("%s/part%d", disk->devfs_name, part);
|
||||
if (p->holder_dir)
|
||||
kobject_unregister(p->holder_dir);
|
||||
kobject_unregister(&p->kobj);
|
||||
}
|
||||
|
||||
|
|
@ -337,6 +358,7 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len)
|
|||
p->kobj.parent = &disk->kobj;
|
||||
p->kobj.ktype = &ktype_part;
|
||||
kobject_register(&p->kobj);
|
||||
partition_sysfs_add_subdir(p);
|
||||
disk->part[part-1] = p;
|
||||
}
|
||||
|
||||
|
|
@ -383,6 +405,7 @@ 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 */
|
||||
|
|
@ -483,6 +506,10 @@ void del_gendisk(struct gendisk *disk)
|
|||
|
||||
devfs_remove_disk(disk);
|
||||
|
||||
if (disk->holder_dir)
|
||||
kobject_unregister(disk->holder_dir);
|
||||
if (disk->slave_dir)
|
||||
kobject_unregister(disk->slave_dir);
|
||||
if (disk->driverfs_dev) {
|
||||
char *disk_name = make_block_name(disk);
|
||||
sysfs_remove_link(&disk->kobj, "device");
|
||||
|
|
|
|||
Loading…
Reference in a new issue