From: Ilya Dryomov Date: Wed, 5 Nov 2014 12:45:58 +0000 (+0300) Subject: libceph: clear r_req_lru_item in __unregister_linger_request() X-Git-Tag: v3.18-rc5~24^2~1 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ba9d114ec5578e6e99a4dfa37ff8ae688040fd64;p=~emulex%2Finfiniband.git libceph: clear r_req_lru_item in __unregister_linger_request() kick_requests() can put linger requests on the notarget list. This means we need to clear the much-overloaded req->r_req_lru_item in __unregister_linger_request() as well, or we get an assertion failure in ceph_osdc_release_request() - !list_empty(&req->r_req_lru_item). AFAICT the assumption was that registered linger requests cannot be on any of req->r_req_lru_item lists, but that's clearly not the case. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 75abaa87aba..decc3b74e65 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1254,6 +1254,8 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc, if (list_empty(&req->r_osd_item)) req->r_osd = NULL; } + + list_del_init(&req->r_req_lru_item); /* can be on notarget */ ceph_osdc_put_request(req); }