From patchwork Mon Dec 10 00:37:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1854901 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 CEC5DDF230 for ; Mon, 10 Dec 2012 00:37:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752209Ab2LJAhU (ORCPT ); Sun, 9 Dec 2012 19:37:20 -0500 Received: from mail-ie0-f181.google.com ([209.85.223.181]:35835 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751443Ab2LJAhT (ORCPT ); Sun, 9 Dec 2012 19:37:19 -0500 Received: by mail-ie0-f181.google.com with SMTP id 16so6950184iea.26 for ; Sun, 09 Dec 2012 16:37:18 -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 :content-type:content-transfer-encoding:x-gm-message-state; bh=2z19mBKGu/uHHX4IAMvCXtpInKlGpVBS/Zn3c/2gPPs=; b=RwqFLVyLZq8JkDFx3ym3NRXQyWj6Qgi8AiZ2Txdo4ezt9N7vIgHiti7g7dUJDQqqgV hzSodjaw2QLuCO8+JGm4W2S2exeov38dtyG6Mdga69A5o0Ig0S7OXbUorJbXmOx4T5Lb ykI4UrtEK3n29qfq5HftTDCiN2A8t0+UXQOLqCfFgGcGynNfDRdNG8Gn0/8SV3msGOKE Xc2w0DaecdsAZKn/Cu9XE+qNFWU8iD5MzGO4vVzeOa4Djn7tRwBVVEGUVAxYh9Y7PLcL WnAf2z7BT0BJVxVflTqWZUhBJSkrZCLfiIEJMgsnfsCQOmoxvap4J0wF5YRIVztIoBFN bN4g== Received: by 10.50.91.195 with SMTP id cg3mr5049915igb.57.1355099838596; Sun, 09 Dec 2012 16:37:18 -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 s3sm5225533igb.14.2012.12.09.16.37.16 (version=SSLv3 cipher=OTHER); Sun, 09 Dec 2012 16:37:17 -0800 (PST) Message-ID: <50C52EBC.9070701@inktank.com> Date: Sun, 09 Dec 2012 18:37:16 -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] rbd: remove linger unconditionally X-Gm-Message-State: ALoCoQmZy2Y14SLeeL3NZouwqcCfKHTsy5YXNNNuyi36izXCY3DTvH28UXcEqAq7Wt8URksrHux0 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 --- 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 c018e52..218a97f 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -833,8 +833,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);