Patchwork [60/93] libceph: register request before unregister linger

login
register
mail settings
Submitter Luis Henriques
Date June 18, 2013, 11:43 a.m.
Message ID <1371555821-12820-61-git-send-email-luis.henriques@canonical.com>
Download mbox | patch
Permalink /patch/252305/
State New
Headers show

Comments

Luis Henriques - June 18, 2013, 11:43 a.m.
3.5.7.15 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Alex Elder <elder@inktank.com>

commit c89ce05e0c5a01a256100ac6a6019f276bdd1ca6 upstream.

In kick_requests(), we need to register the request before we
unregister the linger request.  Otherwise the unregister will
reset the request's osd pointer to NULL.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 net/ceph/osd_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 79592c4..60ae916 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1358,8 +1358,8 @@  static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
 
 		dout("kicking lingering %p tid %llu osd%d\n", req, req->r_tid,
 		     req->r_osd ? req->r_osd->o_osd : -1);
-		__unregister_linger_request(osdc, req);
 		__register_request(osdc, req);
+		__unregister_linger_request(osdc, req);
 	}
 	mutex_unlock(&osdc->request_mutex);