luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rbd: set the mapping size and features later

Browse Source 
Defer setting the size and features fields of a mapped image until
after the Linux disk structure is set up.  Set the capacity of the
disk after that.

Rearrange the definition of rbd_image_header, separating the fields
that are set only once from those that can be updated.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2013-05-06 09:51:29 -05:00
parent 51344a38ba
commit f35a4dee14
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/block/rbd.c
View File

@ -100,21 +100,20 @@
* block device image metadata (in-memory version) * block device image metadata (in-memory version)
*/ */
struct rbd_image_header { struct rbd_image_header {
/* These four fields never change for a given rbd image */ /* These six fields never change for a given rbd image */
char *object_prefix; char *object_prefix;
u64 features;
__u8 obj_order; __u8 obj_order;
__u8 crypt_type; __u8 crypt_type;
__u8 comp_type; __u8 comp_type;
u64 stripe_unit;
u64 stripe_count;
u64 features; /* Might be changeable someday? */
/* The remaining fields need to be updated occasionally */ /* The remaining fields need to be updated occasionally */
u64 image_size; u64 image_size;
struct ceph_snap_context *snapc; struct ceph_snap_context *snapc;
char *snap_names; char *snap_names; /* format 1 only */
u64 *snap_sizes; u64 *snap_sizes; /* format 1 only */
u64 stripe_unit;
u64 stripe_count;
}; };
/* /*
@ -4637,10 +4636,6 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev)
{ {
int ret; int ret;
ret = rbd_dev_mapping_set(rbd_dev);
if (ret)
return ret;
/* generate unique id: find highest unique id, add one */ /* generate unique id: find highest unique id, add one */
rbd_dev_id_get(rbd_dev); rbd_dev_id_get(rbd_dev);
@ -4662,13 +4657,17 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev)
if (ret) if (ret)
goto err_out_blkdev; goto err_out_blkdev;
ret = rbd_bus_add_dev(rbd_dev); ret = rbd_dev_mapping_set(rbd_dev);
if (ret) if (ret)
goto err_out_disk; goto err_out_disk;
set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE);
ret = rbd_bus_add_dev(rbd_dev);
if (ret)
goto err_out_mapping;
/* Everything's ready. Announce the disk to the world. */ /* Everything's ready. Announce the disk to the world. */
set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE);
set_bit(RBD_DEV_FLAG_EXISTS, &rbd_dev->flags); set_bit(RBD_DEV_FLAG_EXISTS, &rbd_dev->flags);
add_disk(rbd_dev->disk); add_disk(rbd_dev->disk);
@ -4677,6 +4676,8 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev)
return ret; return ret;
err_out_mapping:
rbd_dev_mapping_clear(rbd_dev);
err_out_disk: err_out_disk:
rbd_free_disk(rbd_dev); rbd_free_disk(rbd_dev);
err_out_blkdev: err_out_blkdev: