TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

block: implement and use {disk|part}_to_dev()

Browse Source 
Implement {disk|part}_to_dev() and use them to access generic device
instead of directly dereferencing {disk|part}->dev.  To make sure no
user is left behind, rename generic devices fields to __dev.

This is in preparation of unifying partition 0 handling with other
partitions.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Tejun Heo
2008-08-25 19:56:05 +09:00
committed by Jens Axboe
parent 870d665612
commit ed9e198234
11 changed files with 86 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/linux/genhd.h
View File

@@ -15,9 +15,11 @@
#ifdef CONFIG_BLOCK
#define kobj_to_dev(k) container_of(k, struct device, kobj)
#define dev_to_disk(device) container_of(device, struct gendisk, dev)
#define dev_to_part(device) container_of(device, struct hd_struct, dev)
#define kobj_to_dev(k) container_of((k), struct device, kobj)
#define dev_to_disk(device) container_of((device), struct gendisk, __dev)
#define dev_to_part(device) container_of((device), struct hd_struct, __dev)
#define disk_to_dev(disk) (&((disk)->__dev))
#define part_to_dev(part) (&((part)->__dev))
extern struct device_type part_type;
extern struct kobject *block_depr;
@@ -88,7 +90,7 @@ struct disk_stats {
struct hd_struct {
sector_t start_sect;
sector_t nr_sects;
struct device dev;
struct device __dev;
struct kobject *holder_dir;
int policy, partno;
#ifdef CONFIG_FAIL_MAKE_REQUEST
@@ -139,7 +141,7 @@ struct gendisk {
int flags;
struct device *driverfs_dev; // FIXME: remove
struct device dev;
struct device __dev;
struct kobject *holder_dir;
struct kobject *slave_dir;
@@ -163,7 +165,7 @@ struct gendisk {
static inline struct gendisk *part_to_disk(struct hd_struct *part)
{
if (likely(part))
return dev_to_disk((part)->dev.parent);
return dev_to_disk(part_to_dev(part)->parent);
return NULL;
}
@@ -174,12 +176,12 @@ static inline int disk_max_parts(struct gendisk *disk)
static inline dev_t disk_devt(struct gendisk *disk)
{
return disk->dev.devt;
return disk_to_dev(disk)->devt;
}
static inline dev_t part_devt(struct hd_struct *part)
{
return part->dev.devt;
return part_to_dev(part)->devt;
}
extern struct hd_struct *disk_get_part(struct gendisk *disk, int partno);
@@ -187,7 +189,7 @@ extern struct hd_struct *disk_get_part(struct gendisk *disk, int partno);
static inline void disk_put_part(struct hd_struct *part)
{
if (likely(part))
put_device(&part->dev);
put_device(part_to_dev(part));
}
/*