diff --git a/[refs] b/[refs] index 88c6841598ee..cd9e88fa9516 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a978fa20fb657548561dddbfb605fe43654f0825 +refs/heads/master: c89ce05e0c5a01a256100ac6a6019f276bdd1ca6 diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c index 7cd0a7f3bf43..780caf6b0491 100644 --- a/trunk/net/ceph/osd_client.c +++ b/trunk/net/ceph/osd_client.c @@ -1328,8 +1328,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);