From 2062f2559d2ea4967c1b8a91574729aa264983c3 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Sun, 20 Jan 2013 14:44:42 -0600
Subject: [PATCH] --- yaml --- r: 359637 b: refs/heads/master c:
 5ae9db81b45c2d95554c665043afffd5e9a7d5ac h: refs/heads/master i:   359635:
 6a23f0a8b1aab58313b7a4cc403800b002c73f4b v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/block/rbd.c | 33 ---------------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/[refs] b/[refs]
index c9cc7d885b23..2b7ee80187ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8d70035b35dc12135d5835b659b229bcd6d4f94
+refs/heads/master: 5ae9db81b45c2d95554c665043afffd5e9a7d5ac
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 1428795571c9..7a6694d08874 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -1242,12 +1242,6 @@ static int rbd_do_request(struct request *rq,
 	return ret;
 }
 
-static void rbd_simple_req_cb(struct ceph_osd_request *osd_req,
-				struct ceph_msg *msg)
-{
-	ceph_osdc_put_request(osd_req);
-}
-
 /*
  * Do a synchronous ceph osd operation
  */
@@ -1323,32 +1317,6 @@ static void rbd_obj_request_complete(struct rbd_obj_request *obj_request)
 		complete_all(&obj_request->completion);
 }
 
-/*
- * Request sync osd watch
- */
-static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev,
-				   u64 ver,
-				   u64 notify_id)
-{
-	struct ceph_osd_req_op *op;
-	int ret;
-
-	op = rbd_osd_req_op_create(CEPH_OSD_OP_NOTIFY_ACK, notify_id, ver);
-	if (!op)
-		return -ENOMEM;
-
-	ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP,
-			  rbd_dev->header_name, 0, 0, NULL,
-			  NULL, 0,
-			  CEPH_OSD_FLAG_READ,
-			  op,
-			  rbd_simple_req_cb, NULL);
-
-	rbd_osd_req_op_destroy(op);
-
-	return ret;
-}
-
 /*
  * Synchronous osd object method call
  */
@@ -1867,7 +1835,6 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
 		rbd_warn(rbd_dev, "got notification but failed to "
 			   " update snaps: %d\n", rc);
 
-	(void) rbd_req_sync_notify_ack;	/* avoid a warning */
 	rbd_obj_notify_ack_sync(rbd_dev, hver, notify_id);
 }