diff options
| author | Ilya Dryomov <idryomov@redhat.com> | 2014-11-04 18:32:14 +0300 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@redhat.com> | 2014-11-13 22:21:13 +0300 |
| commit | a390de0208e7f2f8fdb2fbf970240e4f7b308037 (patch) | |
| tree | 775a1ba29cee2a886d8e50b69d470be05fd6e59d /net/ceph | |
| parent | aaef31703a0cf6a733e651885bfb49edc3ac6774 (diff) | |
| download | linux-a390de0208e7f2f8fdb2fbf970240e4f7b308037.tar.bz2 | |
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 <idryomov@redhat.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/osd_client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index f3fc54eac09d..75abaa87abac 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1395,6 +1395,7 @@ static int __map_request(struct ceph_osd_client *osdc, if (req->r_osd) { __cancel_request(req); list_del_init(&req->r_osd_item); + list_del_init(&req->r_linger_osd_item); req->r_osd = NULL; } |