From f5fbcc30b84f440e3671b336fa1b8d26a91f6bd8 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Mar 2010 22:20:39 -0700
Subject: [PATCH] --- yaml --- r: 189199 b: refs/heads/master c:
 12eadc190038e68b5884a4aa313b6ab89ba60f5e h: refs/heads/master i:   189197:
 200f3b9081e41984c18ca62c8fcf4e9f3bdac6b9   189195:
 b8d37744379b69c208d446f22cc0cbf82aa62b6d   189191:
 0dbb3095565beebe24b562c8ec3c8697ae318ca0   189183:
 5b24364acc04b434a633a213b34248d2b1153990 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 1c52ab13718e..fe5fac9b02ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a990e7093566ceb07e38951e1a01686923d4f09
+refs/heads/master: 12eadc190038e68b5884a4aa313b6ab89ba60f5e
diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c
index dbe63db9762f..221038253e61 100644
--- a/trunk/fs/ceph/osd_client.c
+++ b/trunk/fs/ceph/osd_client.c
@@ -913,7 +913,7 @@ static int __kick_requests(struct ceph_osd_client *osdc,
 
 kick:
 		dout("kicking %p tid %llu osd%d\n", req, req->r_tid,
-		     req->r_osd->o_osd);
+		     req->r_osd ? req->r_osd->o_osd : -1);
 		req->r_flags |= CEPH_OSD_FLAG_RETRY;
 		err = __send_request(osdc, req);
 		if (err) {