From patchwork Thu Dec 13 17:02:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1875631 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B44C2DF23A for ; Thu, 13 Dec 2012 17:02:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756569Ab2LMRC2 (ORCPT ); Thu, 13 Dec 2012 12:02:28 -0500 Received: from mail-ia0-f174.google.com ([209.85.210.174]:40865 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753702Ab2LMRC1 (ORCPT ); Thu, 13 Dec 2012 12:02:27 -0500 Received: by mail-ia0-f174.google.com with SMTP id y25so2164086iay.19 for ; Thu, 13 Dec 2012 09:02:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=sbODdD+PnnljO3tB858PMsrvHeSDH7rfqwJJT33gkt4=; b=FGkxTrVP9oz4fT5Um1zGW5R4hg0BiWVevrQDUm4Dyp8Cop7sACvVKE1VY+K3G24m/d y/4WSgWBEljgERy2fEizxUFZfRfK4u5FPk3FeLl2+gzKlrBI86STbJZHo4szVTihcY3v moh5PEX+xErAvjB8eBJY3aCNxnHCGFdr0+t3urGm8s+XaeX2l5/rDQYG+NbAHyBMmDpH PcN4jxjsNp3ngKBk3tDF4UiCyleGs9jfiTslKXla9gglWFetxB9CqPI/7ppra1x9rh4t r3xGxXx+iNtyuix7cqJSkLbKnnwBUFI9OH/98WhNy990HkWt8tUz1xJsAWOwBF8soqOP kZmw== Received: by 10.50.236.104 with SMTP id ut8mr2374791igc.20.1355418147436; Thu, 13 Dec 2012 09:02:27 -0800 (PST) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id bh3sm4630890igc.0.2012.12.13.09.02.25 (version=SSLv3 cipher=OTHER); Thu, 13 Dec 2012 09:02:26 -0800 (PST) Message-ID: <50CA0A20.4000502@inktank.com> Date: Thu, 13 Dec 2012 11:02:24 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 6/9] rbd: remove linger unconditionally References: <50CA0915.1090801@inktank.com> In-Reply-To: <50CA0915.1090801@inktank.com> X-Gm-Message-State: ALoCoQndOGJyYSAsHzFinhOuVsaqAMO95BqfOmpfVieJkBNky2gq/+4MOK+hdcV99vYm3YAHVmqS Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org 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 Reviewed-by: Sage Weil --- net/ceph/osd_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) if (list_empty(&req->r_osd->o_requests) && diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 470816c..b15b475 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -907,8 +907,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);