Ping, Jens. Could you have any idea about this cleanup patch?
Thanks Minfei On 11/27/15 at 09:26pm, Minfei Huang wrote: > If null block is a lightnvm device, it wouldn't need to allocate the > variant disk. So it is fine to separate the code for lightnvm and normal > device to use if/else. > > Thus we don't never need the flag out_cleanup_lightnvm. > > Signed-off-by: Minfei Huang <[email protected]> > --- > drivers/block/null_blk.c | 42 +++++++++++++++++++----------------------- > 1 file changed, 19 insertions(+), 23 deletions(-) > > diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c > index 729ecd7..7d5d2e7 100644 > --- a/drivers/block/null_blk.c > +++ b/drivers/block/null_blk.c > @@ -739,32 +739,28 @@ static int null_add_dev(void) > &null_lnvm_dev_ops); > if (rv) > goto out_cleanup_blk_list; > - goto done; > - } > - > - disk = nullb->disk = alloc_disk_node(1, home_node); > - if (!disk) { > - rv = -ENOMEM; > - goto out_cleanup_lightnvm; > + } else { > + disk = nullb->disk = alloc_disk_node(1, home_node); > + if (!disk) { > + rv = -ENOMEM; > + goto out_cleanup_blk_list; > + } > + size = gb * 1024 * 1024 * 1024ULL; > + set_capacity(disk, size >> 9); > + > + disk->flags |= > + GENHD_FL_EXT_DEVT | GENHD_FL_SUPPRESS_PARTITION_INFO; > + disk->major = null_major; > + disk->first_minor = nullb->index; > + disk->fops = &null_fops; > + disk->private_data = nullb; > + disk->queue = nullb->q; > + strncpy(disk->disk_name, nullb->disk_name, DISK_NAME_LEN); > + > + add_disk(disk); > } > - size = gb * 1024 * 1024 * 1024ULL; > - set_capacity(disk, size >> 9); > - > - disk->flags |= GENHD_FL_EXT_DEVT | GENHD_FL_SUPPRESS_PARTITION_INFO; > - disk->major = null_major; > - disk->first_minor = nullb->index; > - disk->fops = &null_fops; > - disk->private_data = nullb; > - disk->queue = nullb->q; > - strncpy(disk->disk_name, nullb->disk_name, DISK_NAME_LEN); > - > - add_disk(disk); > -done: > return 0; > > -out_cleanup_lightnvm: > - if (use_lightnvm) > - nvm_unregister(nullb->disk_name); > out_cleanup_blk_list: > mutex_lock(&lock); > list_del_init(&nullb->list); > -- > 1.8.3.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
