diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-06-18 13:02:12 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-03-05 15:36:57 +0100 |
| commit | 66d37e928df71d6aef8b2dfe8c6dca785653cf1f (patch) | |
| tree | 91f90d9fab361261bcad3c67a9f99f8c171dfe6a /net/ceph/osd_client.c | |
| parent | ebf0333679a79508cc79555d178877cd9eb54e80 (diff) | |
| download | lwn-66d37e928df71d6aef8b2dfe8c6dca785653cf1f.tar.gz lwn-66d37e928df71d6aef8b2dfe8c6dca785653cf1f.zip | |
libceph: assert both regular and lingering lists in __remove_osd()
commit 7c6e6fc53e7335570ed82f77656cedce1502744e upstream.
It is important that both regular and lingering requests lists are
empty when the OSD is removed.
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'net/ceph/osd_client.c')
| -rw-r--r-- | net/ceph/osd_client.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index e6b2db68b4fa..4e24b7338582 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -976,6 +976,8 @@ static void __remove_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd) { dout("__remove_osd %p\n", osd); BUG_ON(!list_empty(&osd->o_requests)); + BUG_ON(!list_empty(&osd->o_linger_requests)); + rb_erase(&osd->o_node, &osdc->osds); list_del_init(&osd->o_osd_lru); ceph_con_close(&osd->o_con); |