diff options
| -rw-r--r-- | drivers/base/driver.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/partition.c | 2 | ||||
| -rw-r--r-- | fs/devfs-core.c | 8 | ||||
| -rw-r--r-- | include/driver.h | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 5867fe45d0..83260990af 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -221,7 +221,7 @@ int unregister_device(struct device_d *old_dev) } list_for_each_entry_safe(cdev, ct, &old_dev->cdevs, devices_list) { - if (cdev->flags & DEVFS_IS_PARTITION) { + if (cdev->master) { dev_dbg(old_dev, "unregister part %s\n", cdev->name); devfs_del_partition(cdev->name); } diff --git a/drivers/mtd/partition.c b/drivers/mtd/partition.c index 777cb758ce..013697732d 100644 --- a/drivers/mtd/partition.c +++ b/drivers/mtd/partition.c @@ -225,6 +225,8 @@ struct mtd_info *mtd_add_partition(struct mtd_info *mtd, off_t offset, if (ret) goto err; + part->cdev.master = &part->master->cdev; + return part; err: free(part->cdev.partname); diff --git a/fs/devfs-core.c b/fs/devfs-core.c index 170d463baa..382606f1cf 100644 --- a/fs/devfs-core.c +++ b/fs/devfs-core.c @@ -37,7 +37,7 @@ int devfs_partition_complete(struct string_list *sl, char *instr) len = strlen(instr); list_for_each_entry(cdev, &cdev_list, list) { - if (cdev->flags & DEVFS_IS_PARTITION && + if (cdev->master && !strncmp(instr, cdev->name, len)) { string_list_add_asprintf(sl, "%s ", cdev->name); } @@ -259,7 +259,7 @@ int devfs_remove(struct cdev *cdev) list_for_each_entry_safe(c, tmp, &cdev->links, link_entry) devfs_remove(c); - if (cdev->flags & DEVFS_IS_PARTITION) + if (cdev->master) list_del(&cdev->partition_entry); if (cdev->link) @@ -326,7 +326,7 @@ static struct cdev *__devfs_add_partition(struct cdev *cdev, new->offset = cdev->offset + offset; new->dev = cdev->dev; - new->flags = partinfo->flags | DEVFS_IS_PARTITION; + new->master = cdev; list_add_tail(&new->partition_entry, &cdev->partitions); @@ -368,7 +368,7 @@ int devfs_del_partition(const char *name) return ret; } - if (!(cdev->flags & DEVFS_IS_PARTITION)) + if (!cdev->master) return -EINVAL; if (cdev->flags & DEVFS_PARTITION_FIXED) return -EPERM; diff --git a/include/driver.h b/include/driver.h index b7eaf290c4..2af66fe345 100644 --- a/include/driver.h +++ b/include/driver.h @@ -460,6 +460,7 @@ struct cdev { struct cdev *link; struct list_head link_entry, links; struct list_head partition_entry, partitions; + struct cdev *master; }; int devfs_create(struct cdev *); @@ -482,7 +483,6 @@ int cdev_erase(struct cdev *cdev, loff_t count, loff_t offset); #define DEVFS_PARTITION_FIXED (1U << 0) #define DEVFS_PARTITION_READONLY (1U << 1) -#define DEVFS_IS_PARTITION (1 << 2) #define DEVFS_IS_CHARACTER_DEV (1 << 3) struct cdev *devfs_add_partition(const char *devname, loff_t offset, |