rbd: drop "object_name" from rbd_req_sync_notify_ack() (7f0a24d8) · Commits · 戴 / test

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>

drivers/block/rbd.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1186,8 +1186,7 @@ static int rbd_req_sync_read(struct rbd_device *rbd_dev,
		*/
		static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev,
		u64 ver,
		u64 notify_id,
		const char *object_name)
		u64 notify_id)
		{
		struct ceph_osd_req_op *ops;
		int ret;
		@@ -1201,7 +1200,7 @@ static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev,
		ops[0].watch.flag = 0;

		ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP,
		object_name, 0, 0, NULL,
		rbd_dev->header_name, 0, 0, NULL,
		NULL, 0,
		CEPH_OSD_FLAG_READ,
		ops,
		@@ -1232,7 +1231,7 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
		pr_warning(RBD_DRV_NAME "%d got notification but failed to "
		" update snaps: %d\n", rbd_dev->major, rc);

		rbd_req_sync_notify_ack(rbd_dev, hver, notify_id, rbd_dev->header_name);
		rbd_req_sync_notify_ack(rbd_dev, hver, notify_id);
		}

		/*

Admin message