Patchwork block: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO

login
register
mail settings
Submitter Duan Jiong
Date Nov. 6, 2013, 7:56 a.m.
Message ID <1383724599-15754-1-git-send-email-duanj.fnst@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/288772/
State New
Headers show

Comments

Duan Jiong - Nov. 6, 2013, 7:56 a.m.
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>
---
 block/ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Jens Axboe - Nov. 7, 2013, 3:29 p.m.
On 11/06/2013 12:56 AM, Duan Jiong wrote:
> This patch fixes coccinelle error regarding usage of IS_ERR and
> PTR_ERR instead of PTR_ERR_OR_ZERO.

Applied, thanks.

Patch

diff --git a/block/ioctl.c b/block/ioctl.c
index a31d91d..7d5c3b2 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)