From 66d22a4246bfe4e6e34f8b1861a47249289d874d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 29 Mar 2011 12:11:06 -0700 Subject: [PATCH] --- yaml --- r: 243540 b: refs/heads/master c: fbdb9190482fd83a3eb20cdeb0da454759f479d7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ceph/osd_client.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d1bd884c0a30..7addc3e33c50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 234af26ff123dfb2aa48772124721b1354c8e0a5 +refs/heads/master: fbdb9190482fd83a3eb20cdeb0da454759f479d7 diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c index 03740e8fc9d1..3b91d651fe08 100644 --- a/trunk/net/ceph/osd_client.c +++ b/trunk/net/ceph/osd_client.c @@ -837,8 +837,7 @@ static void __unregister_request(struct ceph_osd_client *osdc, dout("moving osd to %p lru\n", req->r_osd); __move_osd_to_lru(osdc, req->r_osd); } - if (list_empty(&req->r_osd_item) && - list_empty(&req->r_linger_item)) + if (list_empty(&req->r_linger_item)) req->r_osd = NULL; } @@ -883,7 +882,8 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc, dout("moving osd to %p lru\n", req->r_osd); __move_osd_to_lru(osdc, req->r_osd); } - req->r_osd = NULL; + if (list_empty(&req->r_osd_item)) + req->r_osd = NULL; } }