bsg: simplify __bsg_alloc_command failpath (7e75d730) · Commits · e / devices / android_kernel_oneplus_sm7250

block/bsg.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -128,7 +128,8 @@ static struct bsg_command __bsg_alloc_command(struct bsg_device bd)
	bc = kmem_cache_alloc(bsg_cmd_cachep, GFP_USER);		bc = kmem_cache_alloc(bsg_cmd_cachep, GFP_USER);
	if (unlikely(!bc)) {		if (unlikely(!bc)) {
	spin_lock_irq(&bd->lock);		spin_lock_irq(&bd->lock);
	goto alloc_fail;		bd->queued_cmds--;
			goto out;
	}		}

	memset(bc, 0, sizeof(*bc));		memset(bc, 0, sizeof(*bc));
	@@ -136,8 +137,6 @@ static struct bsg_command __bsg_alloc_command(struct bsg_device bd)
	INIT_LIST_HEAD(&bc->list);		INIT_LIST_HEAD(&bc->list);
	dprintk("%s: returning free cmd %p\n", bd->name, bc);		dprintk("%s: returning free cmd %p\n", bd->name, bc);
	return bc;		return bc;
	alloc_fail:
	bd->queued_cmds--;
	out:		out:
	spin_unlock_irq(&bd->lock);		spin_unlock_irq(&bd->lock);
	return bc;		return bc;