Signed-off-by: Thomas Meyer <[email protected]>
---
diff -u -p a/drivers/block/rbd.c b/drivers/block/rbd.c
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4466,7 +4466,7 @@ static int rbd_dev_image_id(struct rbd_d
image_id = ceph_extract_encoded_string(&p, p + ret,
NULL, GFP_NOIO);
- ret = IS_ERR(image_id) ? PTR_ERR(image_id) : 0;
+ ret = PTR_RET(image_id);
if (!ret)
rbd_dev->image_format = 2;
} else {