]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
isofs: Adjust four checks for null pointers
authorMarkus Elfring <elfring@users.sourceforge.net>
Fri, 18 Aug 2017 19:47:14 +0000 (21:47 +0200)
committerJan Kara <jack@suse.cz>
Wed, 23 Aug 2017 16:53:06 +0000 (18:53 +0200)
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 <elfring@users.sourceforge.net>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/isofs/inode.c

index 2d3f090944dfd2b61c6c713fe08b54997262eb5f..db43f52f2268e451f7cc04edeec88e77ea762ebd 100644 (file)
@@ -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 @@ root_found:
                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,7 +1320,7 @@ 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;
                        goto fail;
                }