diff --git a/[refs] b/[refs] index 9907c8a66d24..682aae92f9c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de71a2970d57463d3d965025e33ec3adcf391248 +refs/heads/master: 9a5d690b08478fc2358d885703014853e44a357e diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index fe7a9e15b6f2..eed58e99e18d 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/drivers/block/rbd.c @@ -1169,7 +1169,6 @@ static int rbd_req_read(struct request *rq, * Request sync osd read */ static int rbd_req_sync_read(struct rbd_device *rbd_dev, - struct ceph_snap_context *snapc, u64 snapid, const char *object_name, u64 ofs, u64 len, @@ -1619,7 +1618,7 @@ static int rbd_read_header(struct rbd_device *rbd_dev, return -ENOMEM; rc = rbd_req_sync_read(rbd_dev, - NULL, CEPH_NOSNAP, + CEPH_NOSNAP, rbd_dev->header_name, 0, len, (char *)dh, &ver);