3.16.62-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Florian Schmaus flo@geekplace.eu
commit 16c1fdf4cfd6c0091e59b93ec2cb7e99973f8244 upstream.
Fixes an error condition reported by checkpatch.pl which is caused by assigning a variable in an if condition.
Signed-off-by: Florian Schmaus flo@geekplace.eu Signed-off-by: Coly Li colyli@suse.de Signed-off-by: Jens Axboe axboe@kernel.dk [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings ben@decadent.org.uk --- drivers/md/bcache/super.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
--- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -2138,9 +2138,15 @@ static int __init bcache_init(void) return bcache_major; }
- if (!(bcache_wq = alloc_workqueue("bcache", WQ_MEM_RECLAIM, 0)) || - !(bcache_kobj = kobject_create_and_add("bcache", fs_kobj)) || - bch_request_init() || + bcache_wq = alloc_workqueue("bcache", WQ_MEM_RECLAIM, 0); + if (!bcache_wq) + goto err; + + bcache_kobj = kobject_create_and_add("bcache", fs_kobj); + if (!bcache_kobj) + goto err; + + if (bch_request_init() || bch_debug_init(bcache_kobj) || sysfs_create_files(bcache_kobj, files)) goto err;