aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-07-25 10:32:40 -0400
committerSage Weil <sage@inktank.com>2012-07-30 21:15:53 -0400
commit7f0a24d8552db422640e810414c43579bb3d9fb9 (patch)
tree64dad1c5be1a37d74911ae6f5adbc28de10217a7 /drivers/block
parent4cb162508afade6d24d58e30be2bbaed80cf84d5 (diff)
rbd: drop "object_name" from rbd_req_sync_notify_ack()
rbd_req_sync_notify_ack() only ever uses rbd_dev->header_name as the value of its "object_name" parameter, and that value is available within the function already. So get rid of the parameter. 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.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index d187d087a50..7884cb0f7ce 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 */
1187static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, 1187static 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/*