From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751658AbdHSHRf (ORCPT ); Sat, 19 Aug 2017 03:17:35 -0400 Received: from mout.web.de ([212.227.15.4]:60590 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750947AbdHSHRd (ORCPT ); Sat, 19 Aug 2017 03:17:33 -0400 Subject: [PATCH 2/4] isofs: Adjust four checks for null pointers From: SF Markus Elfring To: Al Viro , David Howells , Ingo Molnar , Jan Kara , kernel-janitors@vger.kernel.org Cc: LKML References: Message-ID: Date: Sat, 19 Aug 2017 09:17:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:afsV4AegTDEzKDJlWcWorY8o+TjlHbeN5QkPWBpANoSrTeqGpCm +yR+/lkEHOykoALhkheRhVyRjKjSyV9Uyg6G3/klLIa+aInvzbfunhOUW7vqXYbWbw7qc/E ADJlmEr17HjWSUvAHZyYe5V9A8tYOUFPixPLFsw6fA7aD+jAecpFRrH1tPc5/2nfrLzgHiu FxP9bDxX2Wzv1i492VHZg== X-UI-Out-Filterresults: notjunk:1;V01:K0:dFUpGOQ58ug=:Z7hKZnYzq39xyMdlFaKy/b uLVdpXoQzHEWDVVo9k8bfgDwxWTai28YPaTuce9g7fhZ1MKBcdj4ZC0dMSzIAUNRJT+qZseW5 qTe5EozBNXquOBg5EN2fhabHNnNYUfWOZbpnadOD5xJlih0U/Wpi5G/ppaCHJqXsJ6kOzckZc jDxWxz7bwLjcUMfp4QFY9E4Rzu+tzXNTsZl1Kp1T17u2Uk77j7aH0evdY49J49isjO3OT+0BS VNiYHXDGSvIx/Zo1/tyeXU497y9cfD7xHnP6LjqBKSCdx1fHAkLc6Isb8MyHKwBz+95WLlqbP fYa8qB7l7mrNN59UE5l2NLWImju2EcLqVFJDAINg8y5LBVVqQMInZICmzih9VpqqOy/BnpOB7 iVOyuU3tO212OkA/AN8MbEpEui2yDvuw78UDkCITjCcwh9B+F05kG4fqFdvKCNzMDLNDAmzj1 1pnNsKws4+OSExITCusXSJA/7bBlrAyD5yJLxD4ttjWW4Ld/A6+vz7XzNjAbzFrEyS+M+67Kw +VB7ffHoWCwYHdUARu3pVvxciuVWPzaLHeN6d6+dDlYRu346EK3krWWXdym0o0FECfzvOLDRB Mqq441Swhb3VRfxaEtWNOW9HcMoWcmhqD2bTHVi68nqxpoJmLFAkIFkaVSAdaKMZCmX/OXgdq kTuBfwisVV5SNydVZMay+Ywwtp2Pv+ny/HKHGNjWuViiY0caWmfzCkH6HmSajTxq/U5ivlqdv dJKbfwhGHUAONenJOxvXP3MHKIqeAChw6lRllAQH6rE6rOGNuLKG/9BMpZvlrscxUKOyx5o9M ae1/DywoqIZtLZaGI5u5sC+FsnxLEqca8KfeYfFvVxDwDmkF1o= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 18 Aug 2017 21:47:14 +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 --- fs/isofs/inode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 2d3f090944df..db43f52f2268 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -96,7 +96,7 @@ static int __init init_inodecache(void) 0, (SLAB_RECLAIM_ACCOUNT| SLAB_MEM_SPREAD|SLAB_ACCOUNT), init_once); - if (isofs_inode_cachep == NULL) + if (!isofs_inode_cachep) return -ENOMEM; return 0; } @@ -678,7 +678,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) if (isonum_711(vdp->type) == ISO_VD_END) break; if (isonum_711(vdp->type) == ISO_VD_PRIMARY) { - if (pri == NULL) { + if (!pri) { pri = (struct iso_primary_descriptor *)vdp; /* Save the buffer in case we need it ... */ pri_bh = bh; @@ -742,7 +742,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) goto out_freebh; } - if (joliet_level && (pri == NULL || !opt.rock)) { + if (joliet_level && (!pri || !opt.rock)) { /* This is the case of Joliet with the norock mount flag. * A disc with both Joliet and Rock Ridge is handled later */ @@ -1320,5 +1320,5 @@ static int isofs_read_inode(struct inode *inode, int relocated) int frag1 = bufsize - offset; tmpde = kmalloc(de_len, GFP_KERNEL); - if (tmpde == NULL) { + if (!tmpde) { ret = -ENOMEM; -- 2.14.0