提交 c86f86e9 编写于 作者: A Alex Elder 提交者: Sage Weil

rbd: make snap_size order parameter optional

Only one of the two callers of _rbd_dev_v2_snap_size() needs the
order value returned.  So make that an optional argument--a null
pointer if the caller doesn't need it.
Signed-off-by: NAlex Elder <elder@inktank.com>
Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
上级 522a0cc0
...@@ -3494,7 +3494,8 @@ static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id, ...@@ -3494,7 +3494,8 @@ static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id,
if (ret < sizeof (size_buf)) if (ret < sizeof (size_buf))
return -ERANGE; return -ERANGE;
*order = size_buf.order; if (order)
*order = size_buf.order;
*snap_size = le64_to_cpu(size_buf.size); *snap_size = le64_to_cpu(size_buf.size);
dout(" snap_id 0x%016llx order = %u, snap_size = %llu\n", dout(" snap_id 0x%016llx order = %u, snap_size = %llu\n",
...@@ -3939,11 +3940,10 @@ static char *rbd_dev_v2_snap_info(struct rbd_device *rbd_dev, u32 which, ...@@ -3939,11 +3940,10 @@ static char *rbd_dev_v2_snap_info(struct rbd_device *rbd_dev, u32 which,
u64 *snap_size, u64 *snap_features) u64 *snap_size, u64 *snap_features)
{ {
u64 snap_id; u64 snap_id;
u8 order;
int ret; int ret;
snap_id = rbd_dev->header.snapc->snaps[which]; snap_id = rbd_dev->header.snapc->snaps[which];
ret = _rbd_dev_v2_snap_size(rbd_dev, snap_id, &order, snap_size); ret = _rbd_dev_v2_snap_size(rbd_dev, snap_id, NULL, snap_size);
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
ret = _rbd_dev_v2_snap_features(rbd_dev, snap_id, snap_features); ret = _rbd_dev_v2_snap_features(rbd_dev, snap_id, snap_features);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册