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
Merge tag 'v4.4.52' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
block
/
genhd.c
diff --git
a/block/genhd.c
b/block/genhd.c
index e5cafa51567c9d589147523c8ab7b43504f9d725..a5bed6bc869d66d7630a3d5a9f02a5c1adc54ede 100644
(file)
--- a/
block/genhd.c
+++ b/
block/genhd.c
@@
-612,7
+612,7
@@
void add_disk(struct gendisk *disk)
/* Register BDI before referencing it from bdev */
bdi = &disk->queue->backing_dev_info;
/* Register BDI before referencing it from bdev */
bdi = &disk->queue->backing_dev_info;
- bdi_register_
dev(bdi, disk_devt
(disk));
+ bdi_register_
owner(bdi, disk_to_dev
(disk));
blk_register_region(disk_devt(disk), disk->minors, NULL,
exact_match, exact_lock, disk);
blk_register_region(disk_devt(disk), disk->minors, NULL,
exact_match, exact_lock, disk);
@@
-831,6
+831,7
@@
static void disk_seqf_stop(struct seq_file *seqf, void *v)
if (iter) {
class_dev_iter_exit(iter);
kfree(iter);
if (iter) {
class_dev_iter_exit(iter);
kfree(iter);
+ seqf->private = NULL;
}
}
}
}