lkml.org 
[lkml]   [2016]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v4 3/5] um: track 'parent' device in a local variable
From
Date
On 06/21/2016 10:47 PM, Dan Williams wrote:
> In preparation for the removal of 'driverfs_dev' from 'struct gendisk'
> use a local variable to track the parented vs un-parented case in
> ubd_disk_register().
>
> Cc: Jeff Dike <jdike@addtoit.com>
> Cc: Richard Weinberger <richard@nod.at>
> Reported-by: Bart Van Assche <bart.vanassche@sandisk.com>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> ---
> arch/um/drivers/ubd_kern.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
> index ef6b4d960bad..8ec7b4112f55 100644
> --- a/arch/um/drivers/ubd_kern.c
> +++ b/arch/um/drivers/ubd_kern.c
> @@ -801,6 +801,7 @@ static void ubd_device_release(struct device *dev)
> static int ubd_disk_register(int major, u64 size, int unit,
> struct gendisk **disk_out)
> {
> + struct device *dev = NULL;
> struct gendisk *disk;
>
> disk = alloc_disk(1 << UBD_SHIFT);
> @@ -823,12 +824,12 @@ static int ubd_disk_register(int major, u64 size, int unit,
> ubd_devs[unit].pdev.dev.release = ubd_device_release;
> dev_set_drvdata(&ubd_devs[unit].pdev.dev, &ubd_devs[unit]);
> platform_device_register(&ubd_devs[unit].pdev);
> - disk->driverfs_dev = &ubd_devs[unit].pdev.dev;
> + dev = &ubd_devs[unit].pdev.dev;
> }
>
> disk->private_data = &ubd_devs[unit];
> disk->queue = ubd_devs[unit].queue;
> - add_disk(disk);
> + device_add_disk(dev, disk);
>
> *disk_out = disk;
> return 0;

Hello Dan,

The Reported-by tag is intended to give people credit who find bugs in
the upstream kernel. What I reported was a bug not in the upstream
kernel but in a previous version of this patch series so I think the
"Reported-by" tag can be left out from this patch.

Additionally, please consider to use a more descriptive name instead of
"dev", e.g. "parent".

Thanks,

Bart.

\
 
 \ /
  Last update: 2016-06-22 09:01    [W:0.093 / U:0.312 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site