[PATCH 3/8] rbd: remove unnecessary asserts in rbd_dev_image_probe()

2014-07-24 Thread Ilya Dryomov
spec-image_id assert doesn't buy us much and image_format is asserted
in rbd_dev_header_name() and rbd_dev_header_info() anyway.

Signed-off-by: Ilya Dryomov ilya.dryo...@inktank.com
---
 drivers/block/rbd.c |2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 0d3be608f16f..4541f6027e4a 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5143,8 +5143,6 @@ static int rbd_dev_image_probe(struct rbd_device 
*rbd_dev, bool mapping)
ret = rbd_dev_image_id(rbd_dev);
if (ret)
return ret;
-   rbd_assert(rbd_dev-spec-image_id);
-   rbd_assert(rbd_image_format_valid(rbd_dev-image_format));
 
ret = rbd_dev_header_name(rbd_dev);
if (ret)
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe ceph-devel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 3/8] rbd: remove unnecessary asserts in rbd_dev_image_probe()

2014-07-24 Thread Alex Elder
On 07/24/2014 03:42 AM, Ilya Dryomov wrote:
 spec-image_id assert doesn't buy us much and image_format is asserted
 in rbd_dev_header_name() and rbd_dev_header_info() anyway.

Looks good.  Over time I'm sure there are more assertions
that can go away; they were most useful during rapid development
when confidence in certain things was lower.

Reviewed-by: Alex Elder el...@linaro.org


 
 Signed-off-by: Ilya Dryomov ilya.dryo...@inktank.com
 ---
  drivers/block/rbd.c |2 --
  1 file changed, 2 deletions(-)
 
 diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
 index 0d3be608f16f..4541f6027e4a 100644
 --- a/drivers/block/rbd.c
 +++ b/drivers/block/rbd.c
 @@ -5143,8 +5143,6 @@ static int rbd_dev_image_probe(struct rbd_device 
 *rbd_dev, bool mapping)
   ret = rbd_dev_image_id(rbd_dev);
   if (ret)
   return ret;
 - rbd_assert(rbd_dev-spec-image_id);
 - rbd_assert(rbd_image_format_valid(rbd_dev-image_format));
  
   ret = rbd_dev_header_name(rbd_dev);
   if (ret)
 

--
To unsubscribe from this list: send the line unsubscribe ceph-devel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html