From 80ca64d2665ea4ed7a5571723785b187cd3c5d2f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 16 Sep 2011 11:13:17 -0700 Subject: [PATCH] --- yaml --- r: 264203 b: refs/heads/master c: 935b639a049053d0ccbcf7422f2f9cd221642f58 h: refs/heads/master i: 264201: ce2a593426b90081dd03b8ae3647b3d236405d24 264199: 61a677293567fffa72cc3e29ccd97d39c6d6b5b2 v: v3 --- [refs] | 2 +- trunk/net/ceph/osd_client.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a723ac1227a9..d57cae544c39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1cad78932a0d139dceff78e68808e160a224d57a +refs/heads/master: 935b639a049053d0ccbcf7422f2f9cd221642f58 diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c index 16836a7df7a6..88ad8a2501b5 100644 --- a/trunk/net/ceph/osd_client.c +++ b/trunk/net/ceph/osd_client.c @@ -217,6 +217,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, INIT_LIST_HEAD(&req->r_unsafe_item); INIT_LIST_HEAD(&req->r_linger_item); INIT_LIST_HEAD(&req->r_linger_osd); + INIT_LIST_HEAD(&req->r_req_lru_item); req->r_flags = flags; WARN_ON((flags & (CEPH_OSD_FLAG_READ|CEPH_OSD_FLAG_WRITE)) == 0); @@ -816,13 +817,10 @@ static void __register_request(struct ceph_osd_client *osdc, { req->r_tid = ++osdc->last_tid; req->r_request->hdr.tid = cpu_to_le64(req->r_tid); - INIT_LIST_HEAD(&req->r_req_lru_item); - dout("__register_request %p tid %lld\n", req, req->r_tid); __insert_request(osdc, req); ceph_osdc_get_request(req); osdc->num_requests++; - if (osdc->num_requests == 1) { dout(" first request, scheduling timeout\n"); __schedule_osd_timeout(osdc);