From 359d045b1ab73312fc69277912765f49224760af Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Wed, 27 Feb 2013 10:26:25 -0600 Subject: [PATCH] --- yaml --- r: 373311 b: refs/heads/master c: 0d5af1643535508f82d6bcc2b9b93b180e8c3f4b h: refs/heads/master i: 373309: 0fd14821794819371866fc05078ba349e83c93dd 373307: f8d250d743b2daf5a7db7c8e9f21265ba83703a7 373303: cf7c0ee5df67e4381fb8738d65b2158adcb19981 373295: f9d707c8f648f8df7b76d92f3cfe35251600c516 373279: aeaecf457cff43dc575954be3b2f9aca45bcebf4 373247: 30061d9a3d6c181c61e1bba4c0abe486175057cf v: v3 --- [refs] | 2 +- trunk/include/linux/ceph/osd_client.h | 1 + trunk/net/ceph/osd_client.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 02b2750c3e43..717158c6ed04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f99969f42300e52779ae0656678c2534097f2ea +refs/heads/master: 0d5af1643535508f82d6bcc2b9b93b180e8c3f4b diff --git a/trunk/include/linux/ceph/osd_client.h b/trunk/include/linux/ceph/osd_client.h index 1dd5d466b6f9..a79f833bba4a 100644 --- a/trunk/include/linux/ceph/osd_client.h +++ b/trunk/include/linux/ceph/osd_client.h @@ -85,6 +85,7 @@ struct ceph_osd_request { s32 r_reply_op_result[CEPH_OSD_MAX_OP]; int r_got_reply; int r_linger; + int r_completed; struct ceph_osd_client *r_osdc; struct kref r_kref; diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c index 1d9ebf967b00..a28c976ae3ae 100644 --- a/trunk/net/ceph/osd_client.c +++ b/trunk/net/ceph/osd_client.c @@ -1174,6 +1174,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg, u32 reassert_epoch; u64 reassert_version; u32 osdmap_epoch; + int already_completed; int i; tid = le64_to_cpu(msg->hdr.tid); @@ -1282,7 +1283,11 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg, ((flags & CEPH_OSD_FLAG_WRITE) == 0)) __unregister_request(osdc, req); + already_completed = req->r_completed; + req->r_completed = 1; mutex_unlock(&osdc->request_mutex); + if (already_completed) + goto done; if (req->r_callback) req->r_callback(req, msg);