From d11a4d5e6d3296d908c6c8d394efcb56cbe37e2f Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Wed, 8 May 2013 08:49:52 -0500
Subject: [PATCH] --- yaml --- r: 375603 b: refs/heads/master c:
 c48f3f86e248b1649ad22151dd45ef2610101ed3 h: refs/heads/master i:   375601:
 29f1e0e18562154e99de649a5bacdd320b36c01f   375599:
 abdb5783b6378892c01c18ffba8e6b9332f9cdf4 v: v3

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

diff --git a/[refs] b/[refs]
index e7216817eb79..9b837ff51c68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f3ef78861ac4b510175e177899b9b5ba4bbed91
+refs/heads/master: c48f3f86e248b1649ad22151dd45ef2610101ed3
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index e417704de8ca..51c45e793354 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -1357,13 +1357,6 @@ static void rbd_obj_request_put(struct rbd_obj_request *obj_request)
 	kref_put(&obj_request->kref, rbd_obj_request_destroy);
 }
 
-static void rbd_img_request_get(struct rbd_img_request *img_request)
-{
-	dout("%s: img %p (was %d)\n", __func__, img_request,
-		atomic_read(&img_request->kref.refcount));
-	kref_get(&img_request->kref);
-}
-
 static void rbd_img_request_destroy(struct kref *kref);
 static void rbd_img_request_put(struct rbd_img_request *img_request)
 {
@@ -1888,9 +1881,6 @@ static struct rbd_img_request *rbd_img_request_create(
 	INIT_LIST_HEAD(&img_request->obj_requests);
 	kref_init(&img_request->kref);
 
-	rbd_img_request_get(img_request);	/* Avoid a warning */
-	rbd_img_request_put(img_request);	/* TEMPORARY */
-
 	dout("%s: rbd_dev %p %s %llu/%llu -> img %p\n", __func__, rbd_dev,
 		write_request ? "write" : "read", offset, length,
 		img_request);