projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: always set bdev->bd_part
[firefly-linux-kernel-4.4.55.git]
/
fs
/
partitions
/
check.c
diff --git
a/fs/partitions/check.c
b/fs/partitions/check.c
index c442f0aadac32b53c3638c99475be8e7b67e0c91..87298c0fc8ce233c56e47e47dcec67c130a1df1a 100644
(file)
--- a/
fs/partitions/check.c
+++ b/
fs/partitions/check.c
@@
-134,12
+134,7
@@
char *disk_name(struct gendisk *hd, int partno, char *buf)
const char *bdevname(struct block_device *bdev, char *buf)
{
const char *bdevname(struct block_device *bdev, char *buf)
{
- int partno = 0;
-
- if (bdev->bd_part)
- partno = bdev->bd_part->partno;
-
- return disk_name(bdev->bd_disk, partno, buf);
+ return disk_name(bdev->bd_disk, bdev->bd_part->partno, buf);
}
EXPORT_SYMBOL(bdevname);
}
EXPORT_SYMBOL(bdevname);
@@
-173,7
+168,7
@@
check_partition(struct gendisk *hd, struct block_device *bdev)
if (isdigit(state->name[strlen(state->name)-1]))
sprintf(state->name, "p");
if (isdigit(state->name[strlen(state->name)-1]))
sprintf(state->name, "p");
- state->limit = disk_max_parts(hd)
+ 1
;
+ state->limit = disk_max_parts(hd);
i = res = err = 0;
while (!res && check_part[i]) {
memset(&state->parts, 0, sizeof(state->parts));
i = res = err = 0;
while (!res && check_part[i]) {
memset(&state->parts, 0, sizeof(state->parts));
@@
-208,8
+203,8
@@
static ssize_t part_start_show(struct device *dev,
return sprintf(buf, "%llu\n",(unsigned long long)p->start_sect);
}
return sprintf(buf, "%llu\n",(unsigned long long)p->start_sect);
}
-s
tatic s
size_t part_size_show(struct device *dev,
-
struct device_attribute *attr, char *buf)
+ssize_t part_size_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
struct hd_struct *p = dev_to_part(dev);
return sprintf(buf, "%llu\n",(unsigned long long)p->nr_sects);
{
struct hd_struct *p = dev_to_part(dev);
return sprintf(buf, "%llu\n",(unsigned long long)p->nr_sects);
@@
-305,16
+300,6
@@
struct device_type part_type = {
.release = part_release,
};
.release = part_release,
};
-static inline void disk_sysfs_add_subdirs(struct gendisk *disk)
-{
- struct kobject *k;
-
- k = kobject_get(&disk->dev.kobj);
- disk->holder_dir = kobject_create_and_add("holders", k);
- disk->slave_dir = kobject_create_and_add("slaves", k);
- kobject_put(k);
-}
-
static void delete_partition_rcu_cb(struct rcu_head *head)
{
struct hd_struct *part = container_of(head, struct hd_struct, rcu_head);
static void delete_partition_rcu_cb(struct rcu_head *head)
{
struct hd_struct *part = container_of(head, struct hd_struct, rcu_head);
@@
-322,20
+307,21
@@
static void delete_partition_rcu_cb(struct rcu_head *head)
part->start_sect = 0;
part->nr_sects = 0;
part_stat_set_all(part, 0);
part->start_sect = 0;
part->nr_sects = 0;
part_stat_set_all(part, 0);
- put_device(
&part->dev
);
+ put_device(
part_to_dev(part)
);
}
void delete_partition(struct gendisk *disk, int partno)
{
struct hd_struct *part;
}
void delete_partition(struct gendisk *disk, int partno)
{
struct hd_struct *part;
- part = disk->__part[partno
-1
];
+ part = disk->__part[partno];
if (!part)
return;
if (!part)
return;
- rcu_assign_pointer(disk->__part[partno-1], NULL);
+ blk_free_devt(part_devt(part));
+ rcu_assign_pointer(disk->__part[partno], NULL);
kobject_put(part->holder_dir);
kobject_put(part->holder_dir);
- device_del(
&part->dev
);
+ device_del(
part_to_dev(part)
);
call_rcu(&part->rcu_head, delete_partition_rcu_cb);
}
call_rcu(&part->rcu_head, delete_partition_rcu_cb);
}
@@
-352,9
+338,13
@@
int add_partition(struct gendisk *disk, int partno,
sector_t start, sector_t len, int flags)
{
struct hd_struct *p;
sector_t start, sector_t len, int flags)
{
struct hd_struct *p;
+ dev_t devt = MKDEV(0, 0);
+ struct device *ddev = disk_to_dev(disk);
+ struct device *pdev;
+ const char *dname;
int err;
int err;
- if (disk->__part[partno
- 1
])
+ if (disk->__part[partno])
return -EBUSY;
p = kzalloc(sizeof(*p), GFP_KERNEL);
return -EBUSY;
p = kzalloc(sizeof(*p), GFP_KERNEL);
@@
-365,49
+355,54
@@
int add_partition(struct gendisk *disk, int partno,
err = -ENOMEM;
goto out_free;
}
err = -ENOMEM;
goto out_free;
}
+ pdev = part_to_dev(p);
+
p->start_sect = start;
p->nr_sects = len;
p->partno = partno;
p->start_sect = start;
p->nr_sects = len;
p->partno = partno;
- p->policy =
disk->policy
;
+ p->policy =
get_disk_ro(disk)
;
- if (isdigit(disk->dev.bus_id[strlen(disk->dev.bus_id)-1]))
- snprintf(p->dev.bus_id, BUS_ID_SIZE,
-
"%sp%d", disk->dev.bus_id
, partno);
+ dname = dev_name(ddev);
+ if (isdigit(dname[strlen(dname) - 1]))
+
snprintf(pdev->bus_id, BUS_ID_SIZE, "%sp%d", dname
, partno);
else
else
- snprintf(p->dev.bus_id, BUS_ID_SIZE,
- "%s%d", disk->dev.bus_id, partno);
+ snprintf(pdev->bus_id, BUS_ID_SIZE, "%s%d", dname, partno);
+
+ device_initialize(pdev);
+ pdev->class = &block_class;
+ pdev->type = &part_type;
+ pdev->parent = ddev;
- device_initialize(&p->dev);
- p->dev.devt = MKDEV(disk->major, disk->first_minor + partno);
- p->dev.class = &block_class;
- p->dev.type = &part_type;
- p->dev.parent = &disk->dev;
+ err = blk_alloc_devt(p, &devt);
+ if (err)
+ goto out_free;
+ pdev->devt = devt;
/* delay uevent until 'holders' subdir is created */
/* delay uevent until 'holders' subdir is created */
- p
->dev.
uevent_suppress = 1;
- err = device_add(
&p->
dev);
+ p
dev->
uevent_suppress = 1;
+ err = device_add(
p
dev);
if (err)
goto out_put;
err = -ENOMEM;
if (err)
goto out_put;
err = -ENOMEM;
- p->holder_dir = kobject_create_and_add("holders", &p
->dev.
kobj);
+ p->holder_dir = kobject_create_and_add("holders", &p
dev->
kobj);
if (!p->holder_dir)
goto out_del;
if (!p->holder_dir)
goto out_del;
- p
->dev.
uevent_suppress = 0;
+ p
dev->
uevent_suppress = 0;
if (flags & ADDPART_FLAG_WHOLEDISK) {
if (flags & ADDPART_FLAG_WHOLEDISK) {
- err = device_create_file(
&p->
dev, &dev_attr_whole_disk);
+ err = device_create_file(
p
dev, &dev_attr_whole_disk);
if (err)
goto out_del;
}
/* everything is up and running, commence */
INIT_RCU_HEAD(&p->rcu_head);
if (err)
goto out_del;
}
/* everything is up and running, commence */
INIT_RCU_HEAD(&p->rcu_head);
- rcu_assign_pointer(disk->__part[partno
- 1
], p);
+ rcu_assign_pointer(disk->__part[partno], p);
/* suppress uevent if the disk supresses it */
/* suppress uevent if the disk supresses it */
- if (!d
isk->dev.
uevent_suppress)
- kobject_uevent(&p
->dev.
kobj, KOBJ_ADD);
+ if (!d
dev->
uevent_suppress)
+ kobject_uevent(&p
dev->
kobj, KOBJ_ADD);
return 0;
return 0;
@@
-416,46
+411,49
@@
out_free:
return err;
out_del:
kobject_put(p->holder_dir);
return err;
out_del:
kobject_put(p->holder_dir);
- device_del(
&p->
dev);
+ device_del(
p
dev);
out_put:
out_put:
- put_device(&p->dev);
+ put_device(pdev);
+ blk_free_devt(devt);
return err;
}
/* Not exported, helper to add_disk(). */
void register_disk(struct gendisk *disk)
{
return err;
}
/* Not exported, helper to add_disk(). */
void register_disk(struct gendisk *disk)
{
+ struct device *ddev = disk_to_dev(disk);
struct block_device *bdev;
struct disk_part_iter piter;
struct hd_struct *part;
char *s;
int err;
struct block_device *bdev;
struct disk_part_iter piter;
struct hd_struct *part;
char *s;
int err;
- d
isk->dev.
parent = disk->driverfs_dev;
+ d
dev->
parent = disk->driverfs_dev;
- strlcpy(d
isk->dev.
bus_id, disk->disk_name, BUS_ID_SIZE);
+ strlcpy(d
dev->
bus_id, disk->disk_name, BUS_ID_SIZE);
/* ewww... some of these buggers have / in the name... */
/* ewww... some of these buggers have / in the name... */
- s = strchr(d
isk->dev.
bus_id, '/');
+ s = strchr(d
dev->
bus_id, '/');
if (s)
*s = '!';
/* delay uevents, until we scanned partition table */
if (s)
*s = '!';
/* delay uevents, until we scanned partition table */
- d
isk->dev.
uevent_suppress = 1;
+ d
dev->
uevent_suppress = 1;
- if (device_add(
&disk->
dev))
+ if (device_add(
d
dev))
return;
#ifndef CONFIG_SYSFS_DEPRECATED
return;
#ifndef CONFIG_SYSFS_DEPRECATED
- err = sysfs_create_link(block_depr, &d
isk->dev.
kobj,
- kobject_name(&d
isk->dev.
kobj));
+ err = sysfs_create_link(block_depr, &d
dev->
kobj,
+ kobject_name(&d
dev->
kobj));
if (err) {
if (err) {
- device_del(
&disk->
dev);
+ device_del(
d
dev);
return;
}
#endif
return;
}
#endif
- disk_sysfs_add_subdirs(disk);
+ disk->part0.holder_dir = kobject_create_and_add("holders", &ddev->kobj);
+ disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj);
/* No minors to use for partitions */
/* No minors to use for partitions */
- if (!disk_
max_parts
(disk))
+ if (!disk_
partitionable
(disk))
goto exit;
/* No such device (e.g., media were just removed) */
goto exit;
/* No such device (e.g., media were just removed) */
@@
-474,13
+472,13
@@
void register_disk(struct gendisk *disk)
exit:
/* announce disk after possible partitions are created */
exit:
/* announce disk after possible partitions are created */
- d
isk->dev.
uevent_suppress = 0;
- kobject_uevent(&d
isk->dev.
kobj, KOBJ_ADD);
+ d
dev->
uevent_suppress = 0;
+ kobject_uevent(&d
dev->
kobj, KOBJ_ADD);
/* announce possible partitions */
disk_part_iter_init(&piter, disk, 0);
while ((part = disk_part_iter_next(&piter)))
/* announce possible partitions */
disk_part_iter_init(&piter, disk, 0);
while ((part = disk_part_iter_next(&piter)))
- kobject_uevent(&part
->dev.
kobj, KOBJ_ADD);
+ kobject_uevent(&part
_to_dev(part)->
kobj, KOBJ_ADD);
disk_part_iter_exit(&piter);
}
disk_part_iter_exit(&piter);
}
@@
-511,7
+509,7
@@
int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
return -EIO;
/* tell userspace that the media / partition table may have changed */
return -EIO;
/* tell userspace that the media / partition table may have changed */
- kobject_uevent(&disk
->dev.
kobj, KOBJ_CHANGE);
+ kobject_uevent(&disk
_to_dev(disk)->
kobj, KOBJ_CHANGE);
for (p = 1; p < state->limit; p++) {
sector_t size = state->parts[p].size;
for (p = 1; p < state->limit; p++) {
sector_t size = state->parts[p].size;
@@
-574,17
+572,17
@@
void del_gendisk(struct gendisk *disk)
disk_part_iter_exit(&piter);
invalidate_partition(disk, 0);
disk_part_iter_exit(&piter);
invalidate_partition(disk, 0);
-
disk->capacity = 0
;
+
set_capacity(disk, 0)
;
disk->flags &= ~GENHD_FL_UP;
unlink_gendisk(disk);
disk_stat_set_all(disk, 0);
disk->stamp = 0;
disk->flags &= ~GENHD_FL_UP;
unlink_gendisk(disk);
disk_stat_set_all(disk, 0);
disk->stamp = 0;
- kobject_put(disk->holder_dir);
+ kobject_put(disk->
part0.
holder_dir);
kobject_put(disk->slave_dir);
disk->driverfs_dev = NULL;
#ifndef CONFIG_SYSFS_DEPRECATED
kobject_put(disk->slave_dir);
disk->driverfs_dev = NULL;
#ifndef CONFIG_SYSFS_DEPRECATED
- sysfs_remove_link(block_depr, d
isk->dev.bus_id
);
+ sysfs_remove_link(block_depr, d
ev_name(disk_to_dev(disk))
);
#endif
#endif
- device_del(
&disk->dev
);
+ device_del(
disk_to_dev(disk)
);
}
}