diff options
| author | Alex Elder <elder@inktank.com> | 2012-12-06 07:22:04 -0600 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2012-12-20 10:56:39 -0600 |
| commit | c89ce05e0c5a01a256100ac6a6019f276bdd1ca6 (patch) | |
| tree | 400e6f30ae9f256374d51fb2ce084d07eaa0863c /net/ceph | |
| parent | a978fa20fb657548561dddbfb605fe43654f0825 (diff) | |
| download | linux-c89ce05e0c5a01a256100ac6a6019f276bdd1ca6.tar.gz linux-c89ce05e0c5a01a256100ac6a6019f276bdd1ca6.tar.xz | |
libceph: register request before unregister linger
In kick_requests(), we need to register the request before we
unregister the linger request. Otherwise the unregister will
reset the request's osd pointer to NULL.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/osd_client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 7cd0a7f3bf43..780caf6b0491 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1328,8 +1328,8 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend) dout("kicking lingering %p tid %llu osd%d\n", req, req->r_tid, req->r_osd ? req->r_osd->o_osd : -1); - __unregister_linger_request(osdc, req); __register_request(osdc, req); + __unregister_linger_request(osdc, req); } mutex_unlock(&osdc->request_mutex); |