summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-07-14 03:35:11 +0200
committerSage Weil <sage@inktank.com>2012-07-31 03:21:46 +0200
commitd67d4be56a3ec8d07b1f29aab6095b363085b028 (patch)
tree9765e2fd27836f111d12d3120963f1beb2318b53 /drivers/block
parentrbd: make rbd_create_rw_ops() return a pointer (diff)
downloadlinux-d67d4be56a3ec8d07b1f29aab6095b363085b028.tar.xz
linux-d67d4be56a3ec8d07b1f29aab6095b363085b028.zip
rbd: pass null version pointer in add_snap()
rbd_header_add_snap() passes the address of a version variable to rbd_req_sync_exec(), but it ignores the result. Just pass a null pointer instead. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 28670c0c68d5..e1fa12b2ae2e 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1668,7 +1668,6 @@ static int rbd_header_add_snap(struct rbd_device *rbd_dev,
u64 new_snapid;
int ret;
void *data, *p, *e;
- u64 ver;
struct ceph_mon_client *monc;
/* we should create a snapshot only if we're pointing at the head */
@@ -1693,7 +1692,7 @@ static int rbd_header_add_snap(struct rbd_device *rbd_dev,
ret = rbd_req_sync_exec(rbd_dev, rbd_dev->header_name,
"rbd", "snap_add",
- data, p - data, &ver);
+ data, p - data, NULL);
kfree(data);