diff --git a/[refs] b/[refs] index fb161aab59f0..d5363c31c94e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57cfc1060f35ac2345cb37ea474f9644ac5cfd75 +refs/heads/master: d67d4be56a3ec8d07b1f29aab6095b363085b028 diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index 28670c0c68d5..e1fa12b2ae2e 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/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);