From 4100ed214b1d3923cdd2a8bbdb2e39b9650de58a Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Fri, 26 Apr 2013 09:43:47 -0500 Subject: [PATCH] --- yaml --- r: 373500 b: refs/heads/master c: 500d0c0fbb85b59e5e75fc83ff701b7d8aa285f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 688c7dd1b257..3f1d6ab75869 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecb4dc225612e1c0b28d2c1b168422dde4f442a6 +refs/heads/master: 500d0c0fbb85b59e5e75fc83ff701b7d8aa285f9 diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index e728e11096b4..8e56fbd1fcf7 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/drivers/block/rbd.c @@ -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; }