From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Schmaus Subject: [PATCH 3/3] bcache: do not assign in if condition in bcache_device_init() Date: Mon, 18 Jun 2018 12:09:02 +0200 Message-ID: <20180618100902.4015-4-flo@geekplace.eu> References: <20180618100902.4015-1-flo@geekplace.eu> Return-path: In-Reply-To: <20180618100902.4015-1-flo@geekplace.eu> Sender: linux-kernel-owner@vger.kernel.org To: Coly Li , Kent Overstreet , linux-bcache@vger.kernel.org Cc: Florian Schmaus , linux-kernel@vger.kernel.org List-Id: linux-bcache@vger.kernel.org Fixes an error condition reported by checkpatch.pl which is caused by assigning a variable in an if condition. Signed-off-by: Florian Schmaus --- drivers/md/bcache/super.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index f09f4f046315..4a2a028c8754 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -796,11 +796,12 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size, return idx; if (bioset_init(&d->bio_split, 4, offsetof(struct bbio, bio), - BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER) || - !(d->disk = alloc_disk(BCACHE_MINORS))) { - ida_simple_remove(&bcache_device_idx, idx); - return -ENOMEM; - } + BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER)) + goto err; + + d->disk = alloc_disk(BCACHE_MINORS); + if (!d->disk) + goto err; set_capacity(d->disk, sectors); snprintf(d->disk->disk_name, DISK_NAME_LEN, "bcache%i", idx); @@ -834,6 +835,11 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size, blk_queue_write_cache(q, true, true); return 0; + +err: + ida_simple_remove(&bcache_device_idx, idx); + return -ENOMEM; + } /* Cached device */ -- 2.16.4