aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorDuan Jiong <duanj.fnst@cn.fujitsu.com>2013-11-06 02:56:39 -0500
committerJens Axboe <axboe@kernel.dk>2013-11-08 11:05:31 -0500
commitc7d1ba417c7cb7297d14dd47a390ec90ce548d5c (patch)
tree72003dcbf182da96c017c453461368998ecd818d /block
parent8616ebb16bcef312024b9d28719f9bf5c5c3aafb (diff)
block: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
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>
Diffstat (limited to 'block')
-rw-r--r--block/ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/ioctl.c b/block/ioctl.c
index a31d91d9bc5a..7d5c3b20af45 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -64,7 +64,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
64 part = add_partition(disk, partno, start, length, 64 part = add_partition(disk, partno, start, length,
65 ADDPART_FLAG_NONE, NULL); 65 ADDPART_FLAG_NONE, NULL);
66 mutex_unlock(&bdev->bd_mutex); 66 mutex_unlock(&bdev->bd_mutex);
67 return IS_ERR(part) ? PTR_ERR(part) : 0; 67 return PTR_ERR_OR_ZERO(part);
68 case BLKPG_DEL_PARTITION: 68 case BLKPG_DEL_PARTITION:
69 part = disk_get_part(disk, partno); 69 part = disk_get_part(disk, partno);
70 if (!part) 70 if (!part)