From 4fffc858a8be80f0bd370fbfeab9e521e9973601 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 11 May 2010 09:53:18 -0700
Subject: [PATCH] --- yaml --- r: 190804 b: refs/heads/master c:
 0ceed5db321ac0f9782e77dda476ebe28a8e2199 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 28da73695e22..41da432cae7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54ad023ba8108d0163acc931ed4b5e4a8a3a7327
+refs/heads/master: 0ceed5db321ac0f9782e77dda476ebe28a8e2199
diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c
index c7b4dedaace6..8128082a028e 100644
--- a/trunk/fs/ceph/osd_client.c
+++ b/trunk/fs/ceph/osd_client.c
@@ -779,16 +779,18 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
 	struct ceph_osd_request *req;
 	u64 tid;
 	int numops, object_len, flags;
+	s32 result;
 
 	tid = le64_to_cpu(msg->hdr.tid);
 	if (msg->front.iov_len < sizeof(*rhead))
 		goto bad;
 	numops = le32_to_cpu(rhead->num_ops);
 	object_len = le32_to_cpu(rhead->object_len);
+	result = le32_to_cpu(rhead->result);
 	if (msg->front.iov_len != sizeof(*rhead) + object_len +
 	    numops * sizeof(struct ceph_osd_op))
 		goto bad;
-	dout("handle_reply %p tid %llu\n", msg, tid);
+	dout("handle_reply %p tid %llu result %d\n", msg, tid, (int)result);
 
 	/* lookup */
 	mutex_lock(&osdc->request_mutex);
@@ -834,7 +836,8 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
 	dout("handle_reply tid %llu flags %d\n", tid, flags);
 
 	/* either this is a read, or we got the safe response */
-	if ((flags & CEPH_OSD_FLAG_ONDISK) ||
+	if (result < 0 ||
+	    (flags & CEPH_OSD_FLAG_ONDISK) ||
 	    ((flags & CEPH_OSD_FLAG_WRITE) == 0))
 		__unregister_request(osdc, req);