* [PATCH 1/1 RESEND] drivers/block/rbd.c: use PTR_ERR_OR_ZERO
@ 2014-06-15 6:44 Fabian Frederick
0 siblings, 0 replies; only message in thread
From: Fabian Frederick @ 2014-06-15 6:44 UTC (permalink / raw)
To: linux-kernel; +Cc: Fabian Frederick, Yehuda Sadeh, Sage Weil
replace IS_ERR/PTR_ERR
Cc: Yehuda Sadeh <yehuda@inktank.com>
Cc: Sage Weil <sage@inktank.com>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
drivers/block/rbd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4c95b50..552a2ed 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4752,7 +4752,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
image_id = ceph_extract_encoded_string(&p, p + ret,
NULL, GFP_NOIO);
- ret = IS_ERR(image_id) ? PTR_ERR(image_id) : 0;
+ ret = PTR_ERR_OR_ZERO(image_id);
if (!ret)
rbd_dev->image_format = 2;
} else {
--
1.8.4.5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-06-15 6:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-15 6:44 [PATCH 1/1 RESEND] drivers/block/rbd.c: use PTR_ERR_OR_ZERO Fabian Frederick
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).