summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuan Jiong <duanj.fnst@cn.fujitsu.com>2013-11-06 08:56:39 +0100
committerJens Axboe <axboe@kernel.dk>2013-11-08 17:05:31 +0100
commitc7d1ba417c7cb7297d14dd47a390ec90ce548d5c (patch)
tree72003dcbf182da96c017c453461368998ecd818d
parentblock: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO (diff)
downloadlinux-c7d1ba417c7cb7297d14dd47a390ec90ce548d5c.tar.xz
linux-c7d1ba417c7cb7297d14dd47a390ec90ce548d5c.zip
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>
-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
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)