From e5e19b58641739c907c093e66cebe3dbc6d9a4f7 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 27 Sep 2010 10:18:52 -0700
Subject: [PATCH] --- yaml --- r: 211387 b: refs/heads/master c:
 6bc18876ba01fd4a077db6e1ed27201e4bda8864 h: refs/heads/master i:   211385:
 e47643bfedecdda97dbdd6ee3233cb0b038d5710   211383:
 61cd3688e12fae506e32e560b62e24599f3bca75 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/ceph/osd_client.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 	}