From patchwork Wed Oct 17 19:20:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 10646009 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ABC91157A for ; Wed, 17 Oct 2018 19:21:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 989ED286AA for ; Wed, 17 Oct 2018 19:21:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D261287C6; Wed, 17 Oct 2018 19:21:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37347286AA for ; Wed, 17 Oct 2018 19:21:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728406AbeJRDSK (ORCPT ); Wed, 17 Oct 2018 23:18:10 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:36080 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728095AbeJRDSK (ORCPT ); Wed, 17 Oct 2018 23:18:10 -0400 Received: by mail-wm1-f68.google.com with SMTP id a8-v6so3337030wmf.1 for ; Wed, 17 Oct 2018 12:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=rAl3JsYXQ4CjTAOlJoFMjzgFVAkBFsTvesz9cUd8XXo=; b=WpJddlNO6zFaeTWKkETkMNsw0JweOIfnxayErbLhMgTUEq/Wmh3x+iQbQ4DUm7YXKR Xc9KD3JiXQhWNC2s+dQ1vgsrZGJamyXG0oUNOtFs2Xjog7ZlV07GzfRsr35DMeSCLYMr Ox9GG1zO7dxgV5bPao36oJUnkooP+y2dVpCmwKlHw0nuAQbdqMRDDmDDZDw8avI6v2KA PMX2+o5HhSqJMl8+VoFoENe2d5IPGW0ohtlCZ2xpLhbJoOpfhx/ExVF4T2zwf8aAT5wy 6BpVNt1mtDuiYY3AOf+OZDVoUZR15uGHOOOAWx2p0pjTA1jxcC6vgmLuHHTdPPGvrBMT EezA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=rAl3JsYXQ4CjTAOlJoFMjzgFVAkBFsTvesz9cUd8XXo=; b=Sjn54SukdjpNF/nRfXflt7vFUNJPGioUgkzx8oypvSyO15wSXivYDDz5MNT0aU5cr7 SGu6A+x7miHYUEoGuIIIrw+TIwaDLrDOJVqfwWUulHxveOmZbGRnmJfglT+vgoaCfboz 4071YIlvNGmX/2zuIgPYfxDojsEi43A8Yc03xPYf3dWzsm8JHbGBiO2YDPlizD/Ay+l9 74/45zh/q9fJKeG3YWfF5Nt6VPEXoRn2N/Hrhn9LGASCrOR0U7U/NkMLMlQAol3nBttP 1d/vqtqiBP3BzkU/6uYKUOMN/b9uyZtqNW0wOI6MhpjiIIoWezPkB/HQxMrgwH10Y6I5 /7wg== X-Gm-Message-State: ABuFfojwwTOPr8iGc4nFceLp0AfaZuXCw14Csitp9aADHjR6kuvrxNGe 0EGKQ6la6hPMGQ8p+0i3LWUgjuJZ X-Google-Smtp-Source: ACcGV63H++UuNULugSErmJzTgue3YZ0d8fxtnJ5mB7ltfRkcA2rA0Qqf0F6nm5qH85VyGF7lHjjxtA== X-Received: by 2002:a1c:6655:: with SMTP id a82-v6mr4357918wmc.10.1539804061708; Wed, 17 Oct 2018 12:21:01 -0700 (PDT) Received: from orange.redhat.com ([213.175.37.12]) by smtp.gmail.com with ESMTPSA id f7-v6sm16059501wrr.68.2018.10.17.12.21.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Oct 2018 12:21:00 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 04/10] ceph: num_ops is off by one in ceph_aio_retry_work() Date: Wed, 17 Oct 2018 21:20:23 +0200 Message-Id: <20181017192029.23294-5-idryomov@gmail.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181017192029.23294-1-idryomov@gmail.com> References: <20181017192029.23294-1-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Two OSD op slots are allocated, but only one is ever used. Signed-off-by: Ilya Dryomov --- fs/ceph/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 213e7d98248a..0265f9ae0ab9 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -858,7 +858,7 @@ static void ceph_aio_retry_work(struct work_struct *work) } spin_unlock(&ci->i_ceph_lock); - req = ceph_osdc_alloc_request(orig_req->r_osdc, snapc, 2, + req = ceph_osdc_alloc_request(orig_req->r_osdc, snapc, 1, false, GFP_NOFS); if (!req) { ret = -ENOMEM;