summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorYan, Zheng <zheng.z.yan@intel.com>2012-06-06 09:15:33 -0500
committerAlex Elder <elder@dreamhost.com>2012-06-06 09:23:53 -0500
commitf9f9a1904467816452fc70740165030e84c2c659 (patch)
tree96523c35dd3b4b8ae3c8f13553fb549580bcf09b /drivers/block
parenta5988c490ef66cb04ea2f610681949b25c773b3c (diff)
downloadop-kernel-dev-f9f9a1904467816452fc70740165030e84c2c659.zip
op-kernel-dev-f9f9a1904467816452fc70740165030e84c2c659.tar.gz
rbd: Fix ceph_snap_context size calculation
ceph_snap_context->snaps is an u64 array Signed-off-by: Zheng Yan <zheng.z.yan@intel.com> Reviewed-by: Alex Elder <elder@inktank.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 65665c9..8b9c173 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -499,7 +499,7 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
/ sizeof (*ondisk))
return -EINVAL;
header->snapc = kmalloc(sizeof(struct ceph_snap_context) +
- snap_count * sizeof (*ondisk),
+ snap_count * sizeof(u64),
gfp_flags);
if (!header->snapc)
return -ENOMEM;
OpenPOWER on IntegriCloud