diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-06-18 13:02:12 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-06 14:43:25 -0800 |
| commit | 81113cfff3b3b1635a776896bed8fc92b365d81b (patch) | |
| tree | 935408081152fbbc8173af8893b68fa9ee7b8571 /net | |
| parent | d18cfaae3ac71f773a6b1ea02d03f8af6b4a00ad (diff) | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -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 0676f2b199d6..e28d169cfee7 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -979,6 +979,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); |