From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753223AbdEHH5r (ORCPT ); Mon, 8 May 2017 03:57:47 -0400 Received: from mout.web.de ([212.227.17.12]:63714 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751116AbdEHH5p (ORCPT ); Mon, 8 May 2017 03:57:45 -0400 Subject: [PATCH 2/3] block-aoe: Adjust eight checks for null pointers From: SF Markus Elfring To: kernel-janitors@vger.kernel.org, "Ed L. Cashin" Cc: LKML References: <705a2cf5-90fe-ec8a-95f9-a27bccbc3f3f@users.sourceforge.net> Message-ID: <172bc5f6-ef1b-6c98-54ac-299c1c7247ed@users.sourceforge.net> Date: Mon, 8 May 2017 09:57:39 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 MIME-Version: 1.0 In-Reply-To: <705a2cf5-90fe-ec8a-95f9-a27bccbc3f3f@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:JV7jHTgehvAzrjJYkmW0gT5YDX29UimAPg1oV13L7Go09cwNfB8 cQQPGVWAYhnrX/bYLeldTJ+eKZdal/GB4wgRxNOJW42Bde0BjSco5ikIClTawjQV/h4bhZw c+1oZdYTEv01UdetR9a/yLk4UEGxB7E1HWJWEqt3BEkf8uQYDpEu6JCyQ+Q96H6FQJV9O6h FYi1E3OHYyxo7kOr73UVA== X-UI-Out-Filterresults: notjunk:1;V01:K0:zs9HMTdLs30=:tHQPefrUJCTbAhj+AjbzCq tKL8z0w5b/z8E1PlsJNC9+WJ+4GHKsbPF5uWMddxNRzIV1iaU3Vu88q82ftWStXNECq2L34EM JT5A43iaq5P5PEfD73WMTokt/1N5t6tHQidD0NAuRZ6ULmU6+rpwT5lAsW8O49jL6im4qnhYD QE+ObIpyAu6EzM4tQnNB6jnBniNlSO9v6RmQfHDsSdRQwZmuT2+Xo4S49D6I4J/HUrYzegbLI us+EHnyoZSA6yDdcRXG6GhqVCXVvq5feHvBRTi8rjAUdFAYZbUQ30YIMj29R9u8lHQNpNGGMG Oao7r+o2nv/r+pF0dty0wWNoG2brM7bTY+s7sUKwP50gZEgTTDJb76DJKjskH3F/Js9kzkd3V pSTtp0kFAnXO/NhOHlunSWOui3H9BhqfMl3up0VaMlE2nwGuklqemfMG+aWnndKon70mWElyI 10BNxrfPyozuDvPtnYhUcTdUnMUfUttkhsn/9LLFUAcyR+4yLW57dGv5M/Ot+fXOVypUGymDD zHEcHQWn4rKJEzZvcp98dV+rxzR2VkEWi0TP8aLe1eLpDNtKvqNjLFpJxMoJ73yRzDmNET4/7 zJ7hmHO9MNNQRnZ/mxrCgI5VCTYzxynSG8FF0DZMo3L8OrD/q53/3Y0mBjGzl/oVbFvNtT/Ey SmuSV8NqSKTBKh91/9wmPAaODoj4PZkVYLt9i3D3lqC5dHxf8FqFaAiainwMLOQzhdDY+m3LR jAQKEVOeISNBEKDtMVXZPP24WQZ0fnJe6ClqJUZLXRC37RqgL0jv6jC5akq/XFi60OZspVrMz 8Kwf1Tg Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 8 May 2017 09:19:22 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written !… Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/block/aoe/aoeblk.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c index cfcf21ec123d..a52555984e73 100644 --- a/drivers/block/aoe/aoeblk.c +++ b/drivers/block/aoe/aoeblk.c @@ -51,7 +51,7 @@ static ssize_t aoedisk_show_mac(struct device *dev, struct aoedev *d = disk->private_data; struct aoetgt *t = d->targets[0]; - if (t == NULL) + if (!t) return snprintf(page, PAGE_SIZE, "none\n"); return snprintf(page, PAGE_SIZE, "%pm\n", t->addr); } @@ -84,7 +84,7 @@ static ssize_t aoedisk_show_netif(struct device *dev, ne = nd; nd = nds; - if (*nd == NULL) + if (!*nd) return snprintf(page, PAGE_SIZE, "none\n"); for (p = page; nd < ne; nd++) p += snprintf(p, PAGE_SIZE - (p-page), "%s%s", @@ -194,10 +194,10 @@ aoedisk_add_debugfs(struct aoedev *d) struct dentry *entry; char *p; - if (aoe_debugfs_dir == NULL) + if (!aoe_debugfs_dir) return; p = strchr(d->gd->disk_name, '/'); - if (p == NULL) + if (!p) p = d->gd->disk_name; else p++; @@ -369,7 +369,7 @@ aoeblk_gdalloc(void *vp) return; gd = alloc_disk(AOE_PARTITIONS); - if (gd == NULL) { + if (!gd) { pr_err("aoe: cannot allocate disk structure for %ld.%d\n", d->aoemajor, d->aoeminor); goto err; @@ -377,13 +377,13 @@ aoeblk_gdalloc(void *vp) mp = mempool_create(MIN_BUFS, mempool_alloc_slab, mempool_free_slab, buf_pool_cache); - if (mp == NULL) { + if (!mp) { printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%d\n", d->aoemajor, d->aoeminor); goto err_disk; } q = blk_init_queue(aoeblk_request, &d->lock); - if (q == NULL) { + if (!q) { pr_err("aoe: cannot allocate block queue for %ld.%d\n", d->aoemajor, d->aoeminor); goto err_mempool; @@ -452,7 +452,7 @@ aoeblk_init(void) buf_pool_cache = kmem_cache_create("aoe_bufs", sizeof(struct buf), 0, 0, NULL); - if (buf_pool_cache == NULL) + if (!buf_pool_cache) return -ENOMEM; aoe_debugfs_dir = debugfs_create_dir("aoe", NULL); if (IS_ERR_OR_NULL(aoe_debugfs_dir)) { -- 2.12.2