Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 20:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: don't bother checking whether order changes

Browse Source 
When a format 2 image is refreshed, code is in place to verify that
the object order never changes from what it was originally.  This
relies on the fact that the refresh will occur *after* an initial
load of information about the image.

An upcoming patch makes it possible for the refresh to occur first,
so we can no longer make this order check.  The order really can't
ever change anyway--this was just a sanity check.  So get rid of it.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2013-04-27 09:59:31 -05:00 committed by Sage Weil
parent 0d8189e175
commit 96f03e08f9
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/rbd.c
View File

@ -4024,20 +4024,12 @@ static char *rbd_dev_snap_info(struct rbd_device *rbd_dev, u32 which,
static int rbd_dev_v2_refresh(struct rbd_device *rbd_dev, u64 *hver) static int rbd_dev_v2_refresh(struct rbd_device *rbd_dev, u64 *hver)
{ {
int ret; int ret;
__u8 obj_order;
down_write(&rbd_dev->header_rwsem); down_write(&rbd_dev->header_rwsem);
/* Grab old order first, to see if it changes */
obj_order = rbd_dev->header.obj_order,
ret = rbd_dev_v2_image_size(rbd_dev); ret = rbd_dev_v2_image_size(rbd_dev);
if (ret) if (ret)
goto out; goto out;
if (rbd_dev->header.obj_order != obj_order) {
ret = -EIO;
goto out;
}
rbd_update_mapping_size(rbd_dev); rbd_update_mapping_size(rbd_dev);
ret = rbd_dev_v2_snap_context(rbd_dev, hver); ret = rbd_dev_v2_snap_context(rbd_dev, hver);