From: zhong jiang <zhongjiang@huawei.com>
Date: Wed, 1 Aug 2018 00:13:14 +0800
Subject: [PATCH] block/bsg-lib: use PTR_ERR_OR_ZERO to simplify the flow path
Git-commit: 4725549192c9633b6a3740bf23770cb758bee4a0
Patch-mainline: v4.19-rc1
References: bsc#1104967,FATE#325924
Simplify the code by using the PTR_ERR_OR_ZERO, instead of the
open code. It is better.
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Hannes Reinecke <hare@suse.com>
---
block/bsg-lib.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index 9419def8c017..f3501cdaf1a6 100644
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -48,9 +48,8 @@ static int bsg_transport_fill_hdr(struct request *rq, struct sg_io_v4 *hdr,
job->request_len = hdr->request_len;
job->request = memdup_user(uptr64(hdr->request), hdr->request_len);
- if (IS_ERR(job->request))
- return PTR_ERR(job->request);
- return 0;
+
+ return PTR_ERR_OR_ZERO(job->request);
}
static int bsg_transport_complete_rq(struct request *rq, struct sg_io_v4 *hdr)
--
2.16.4