block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p)
Yang Zhang [Fri, 17 Dec 2010 07:58:36 +0000 (08:58 +0100)]
Signed-off-by: Yang Zhang <kthreadd@gmail.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

block/genhd.c

index 5fa2b44..79b9e32 100644 (file)
@@ -735,7 +735,7 @@ static void *show_partition_start(struct seq_file *seqf, loff_t *pos)
        static void *p;
 
        p = disk_seqf_start(seqf, pos);
-       if (!IS_ERR(p) && p && !*pos)
+       if (!IS_ERR_OR_NULL(p) && !*pos)
                seq_puts(seqf, "major minor  #blocks  name\n\n");
        return p;
 }