Commit 521a04d0 authored May 11, 2015 by Ilya Dryomov

Revert "libceph: clear r_req_lru_item in __unregister_linger_request()"



This reverts commit ba9d114e.

.. which introduced a regression that prevented all lingering requests
requeued in kick_requests() from ever being sent to the OSDs, resulting
in a lot of missed notifies.  In retrospect it's pretty obvious that
r_req_lru_item item in the case of lingering requests can be used not
only for notarget, but also for unsent linkage due to how tightly
actual map and enqueue operations are coupled in __map_request().

The assertion that was being silenced is taken care of in the previous
("libceph: request a new osdmap if lingering request maps to no osd")
commit: by always kicking homeless lingering requests we ensure that
none of them ends up on the notarget list outside of the critical
section guarded by request_mutex.

Cc: stable@vger.kernel.org # 3.18+, needs b0494532 "libceph: request a new osdmap if lingering request maps to no osd"
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>

parent b0494532

net/ceph/osd_client.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1306,8 +1306,6 @@ 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);
		}

Admin message