From patchwork Wed Nov 5 17:33:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 5236851 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9E9319F295 for ; Wed, 5 Nov 2014 17:33:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C7D2020145 for ; Wed, 5 Nov 2014 17:33:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F409B20138 for ; Wed, 5 Nov 2014 17:33:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755051AbaKERdt (ORCPT ); Wed, 5 Nov 2014 12:33:49 -0500 Received: from mail-lb0-f173.google.com ([209.85.217.173]:55497 "EHLO mail-lb0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755020AbaKERds (ORCPT ); Wed, 5 Nov 2014 12:33:48 -0500 Received: by mail-lb0-f173.google.com with SMTP id n15so1095702lbi.18 for ; Wed, 05 Nov 2014 09:33:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=TkPh9ZGjn1ydciNx0ThiKw9OnTkOBy4BmDlhXVbG8n4=; b=Io+mTRHDZqG6LkffUD1C5FX+VBx5RaFwh3qlYakBJGRTvfj08Lr9AVcfgYCwlTH311 Xb5/0xuPltlAtnygT9VKqYEbZ8iCX+ysyM4Ds5pg0V3IWVnyxk+PAXHzKnmS7y4KOs8H 54QHt9f+jzfRrudTc3WPILK47NSxcSq1kv+qZIlmbeBBeCarNRoRm8v9fs1bDLQ3FDkQ Hd/pc7nRU+wJIpvTeYEdcSXXieyz6C5qvGLisDgbKa2b+7lM79FdhHvuZYI8YZKvhM+l kSQ8ZADk+0VO7ITDWeY+UcVmADAyAWnH3Fo5FzBC6kw6lkvWzD9U+ESfpWgVn8+OOZgZ ghmA== X-Gm-Message-State: ALoCoQlepBYoRCsUoVr4BPcBpP0TT5Lnrw1ow/3WkYakxscREWa2HL5UDfs8HxS+XwzynfMTI92W X-Received: by 10.112.142.33 with SMTP id rt1mr69286035lbb.85.1415208826469; Wed, 05 Nov 2014 09:33:46 -0800 (PST) Received: from localhost ([109.110.66.36]) by mx.google.com with ESMTPSA id xs6sm1554184lbb.13.2014.11.05.09.33.45 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 05 Nov 2014 09:33:45 -0800 (PST) From: Ilya Dryomov X-Google-Original-From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 2/3] libceph: clear r_req_lru_item in __unregister_linger_request() Date: Wed, 5 Nov 2014 20:33:23 +0300 Message-Id: <1415208804-10163-3-git-send-email-idryomov@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1415208804-10163-1-git-send-email-idryomov@redhat.com> References: <1415208804-10163-1-git-send-email-idryomov@redhat.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- net/ceph/osd_client.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index ce09da2cf32b..2a42c795b1ac 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); }