diff options
| author |   Ilya Dryomov <idryomov@redhat.com> | 2014-11-05 15:45:58 +0300 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@redhat.com> | 2014-11-13 22:21:14 +0300 |
| commit | ba9d114ec5578e6e99a4dfa37ff8ae688040fd64 (patch) | |
| tree | afdc6c5bbf5c1f690498e22908f3492f50f950d8 /net/ceph/osd_client.c | |
| parent | libceph: unlink from o_linger_requests when clearing r_osd (diff) | |
| download | linux-dev-ba9d114ec5578e6e99a4dfa37ff8ae688040fd64.tar.xz linux-dev-ba9d114ec5578e6e99a4dfa37ff8ae688040fd64.zip | |
libceph: clear r_req_lru_item in __unregister_linger_request()
kick_requests() can put linger requests on the notarget list. This
means we need to clear the much-overloaded req->r_req_lru_item in
__unregister_linger_request() as well, or we get an assertion failure
in ceph_osdc_release_request() - !list_empty(&req->r_req_lru_item).
AFAICT the assumption was that registered linger requests cannot be on
any of req->r_req_lru_item lists, but that's clearly not the case.
Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to '')
| -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 75abaa87abac..decc3b74e65f 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1254,6 +1254,8 @@ 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); } |