From: Ilya Dryomov Date: Tue, 4 Nov 2014 15:32:14 +0000 (+0300) Subject: libceph: unlink from o_linger_requests when clearing r_osd X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~121^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a390de0208e7f2f8fdb2fbf970240e4f7b308037;p=pandora-kernel.git libceph: unlink from o_linger_requests when clearing r_osd Requests have to be unlinked from both osd->o_requests (normal requests) and osd->o_linger_requests (linger requests) lists when clearing req->r_osd. Otherwise __unregister_linger_request() gets confused and we trip over a !list_empty(&osd->o_linger_requests) assert in __remove_osd(). MON=1 OSD=1: # cat remove-osd.sh #!/bin/bash rbd create --size 1 test DEV=$(rbd map test) ceph osd out 0 sleep 3 rbd map dne/dne # obtain a new osdmap as a side effect rbd unmap $DEV & # will block sleep 3 ceph osd in 0 Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- Reading git-diff-tree failed