]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
block: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
authorDuan Jiong <duanj.fnst@cn.fujitsu.com>
Wed, 6 Nov 2013 07:56:39 +0000 (15:56 +0800)
committerJens Axboe <axboe@kernel.dk>
Fri, 8 Nov 2013 16:05:31 +0000 (09:05 -0700)
This patch fixes coccinelle error regarding usage of IS_ERR and
PTR_ERR instead of PTR_ERR_OR_ZERO.

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/ioctl.c

index a31d91d9bc5a33d70388b0063e1d80c41383c125..7d5c3b20af451a111834efbabbdd83269085f123 100644 (file)
@@ -64,7 +64,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
                        part = add_partition(disk, partno, start, length,
                                             ADDPART_FLAG_NONE, NULL);
                        mutex_unlock(&bdev->bd_mutex);
-                       return IS_ERR(part) ? PTR_ERR(part) : 0;
+                       return PTR_ERR_OR_ZERO(part);
                case BLKPG_DEL_PARTITION:
                        part = disk_get_part(disk, partno);
                        if (!part)