summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-12-06 19:37:23 +0400
committerAlex Elder <elder@inktank.com>2012-12-17 22:07:31 +0400
commit61c74035626beb25a39b0273ccf7d75510bc36a1 (patch)
tree7544f2c85f9e10911b0c463fa6422db096c7054e /net
parent2fd82b9e92c2a718ae81fc987b4468ceeee6979b (diff)
downloadlinux-61c74035626beb25a39b0273ccf7d75510bc36a1.tar.xz
rbd: remove linger unconditionally
In __unregister_linger_request(), the request is being removed from the osd client's req_linger list only when the request has a non-null osd pointer. It should be done whether or not the request currently has an osd. This is most likely a non-issue because I believe the request will always have an osd when this function is called. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/osd_client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 60c74c1f1ea9..32bd696b39a8 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -906,8 +906,8 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc,
struct ceph_osd_request *req)
{
dout("__unregister_linger_request %p\n", req);
+ list_del_init(&req->r_linger_item);
if (req->r_osd) {
- list_del_init(&req->r_linger_item);
list_del_init(&req->r_linger_osd);
if (list_empty(&req->r_osd->o_requests) &&