diff --git a/[refs] b/[refs]
index fcc0389548c5..0a392576f24e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 936aeb5c4a9fa799abd7d630a94223acedcaad50
+refs/heads/master: 6bc18876ba01fd4a077db6e1ed27201e4bda8864
diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c
index dfced1dacbcd..3b5571b8ce22 100644
--- a/trunk/fs/ceph/osd_client.c
+++ b/trunk/fs/ceph/osd_client.c
@@ -549,7 +549,7 @@ static void __unregister_request(struct ceph_osd_client *osdc,
  */
 static void __cancel_request(struct ceph_osd_request *req)
 {
-	if (req->r_sent) {
+	if (req->r_sent && req->r_osd) {
 		ceph_con_revoke(&req->r_osd->o_con, req->r_request);
 		req->r_sent = 0;
 	}