From: Alex Elder Date: Thu, 6 Dec 2012 13:22:04 +0000 (-0600) Subject: libceph: register request before unregister linger X-Git-Tag: v3.7.3~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec3f5ec9d2cdb7dcf5e842a244301e4085d45bd0;p=thirdparty%2Fkernel%2Fstable.git libceph: register request before unregister linger (cherry picked from commit c89ce05e0c5a01a256100ac6a6019f276bdd1ca6) 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 Reviewed-by: Sage Weil Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index a2d4d9757c99b..093f596fa11f7 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1366,8 +1366,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);