diff --git a/[refs] b/[refs]
index 53ac2cd74ca1..cc804a00517a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3da54776e2c0385c32d143fd497a7f40a88e29dd
+refs/heads/master: 35f9f8a09e1e88e31bd34a1e645ca0e5f070dd5c
diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c
index b7d633cc96a6..b098e7b591f0 100644
--- a/trunk/net/ceph/osd_client.c
+++ b/trunk/net/ceph/osd_client.c
@@ -841,6 +841,12 @@ static void register_request(struct ceph_osd_client *osdc,
 static void __unregister_request(struct ceph_osd_client *osdc,
 				 struct ceph_osd_request *req)
 {
+	if (RB_EMPTY_NODE(&req->r_node)) {
+		dout("__unregister_request %p tid %lld not registered\n",
+			req, req->r_tid);
+		return;
+	}
+
 	dout("__unregister_request %p tid %lld\n", req, req->r_tid);
 	rb_erase(&req->r_node, &osdc->requests);
 	osdc->num_requests--;