OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rbd: move stripe_unit and stripe_count into header 

This commit added fetching if fancy striping parameters:
    09186ddb rbd: get and check striping parameters

They are almost unused, but the two fields storing the information
really belonged in the rbd_image_header structure.

This patch moves them there.

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-26 09:43:47 -05:00 committed by Sage Weil
parent ecb4dc2256
commit 500d0c0fbb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/block/rbd.c
View File

@ -108,6 +108,9 @@ struct rbd_image_header {
char *snap_names;
u64 *snap_sizes;
u64 stripe_unit;
u64 stripe_count;
u64 obj_version;
};
@ -316,9 +319,6 @@ struct rbd_device {
u64 parent_overlap;
struct rbd_device *parent;
u64 stripe_unit;
u64 stripe_count;
/* protects updating the header */
struct rw_semaphore header_rwsem;
@ -3695,8 +3695,8 @@ static int rbd_dev_v2_striping_info(struct rbd_device *rbd_dev)
"(got %llu want 1)", stripe_count);
return -EINVAL;
}
rbd_dev->stripe_unit = stripe_unit;
rbd_dev->stripe_count = stripe_count;
rbd_dev->header.stripe_unit = stripe_unit;
rbd_dev->header.stripe_count = stripe_count;
return 0;
}