diff options
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/rbd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index d187d087a505..7884cb0f7ce1 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -1186,8 +1186,7 @@ static int rbd_req_sync_read(struct rbd_device *rbd_dev, | |||
1186 | */ | 1186 | */ |
1187 | static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, | 1187 | static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, |
1188 | u64 ver, | 1188 | u64 ver, |
1189 | u64 notify_id, | 1189 | u64 notify_id) |
1190 | const char *object_name) | ||
1191 | { | 1190 | { |
1192 | struct ceph_osd_req_op *ops; | 1191 | struct ceph_osd_req_op *ops; |
1193 | int ret; | 1192 | int ret; |
@@ -1201,7 +1200,7 @@ static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, | |||
1201 | ops[0].watch.flag = 0; | 1200 | ops[0].watch.flag = 0; |
1202 | 1201 | ||
1203 | ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP, | 1202 | ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP, |
1204 | object_name, 0, 0, NULL, | 1203 | rbd_dev->header_name, 0, 0, NULL, |
1205 | NULL, 0, | 1204 | NULL, 0, |
1206 | CEPH_OSD_FLAG_READ, | 1205 | CEPH_OSD_FLAG_READ, |
1207 | ops, | 1206 | ops, |
@@ -1232,7 +1231,7 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data) | |||
1232 | pr_warning(RBD_DRV_NAME "%d got notification but failed to " | 1231 | pr_warning(RBD_DRV_NAME "%d got notification but failed to " |
1233 | " update snaps: %d\n", rbd_dev->major, rc); | 1232 | " update snaps: %d\n", rbd_dev->major, rc); |
1234 | 1233 | ||
1235 | rbd_req_sync_notify_ack(rbd_dev, hver, notify_id, rbd_dev->header_name); | 1234 | rbd_req_sync_notify_ack(rbd_dev, hver, notify_id); |
1236 | } | 1235 | } |
1237 | 1236 | ||
1238 | /* | 1237 | /* |