From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F176AC282C4 for ; Mon, 4 Feb 2019 10:42:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C23932087C for ; Mon, 4 Feb 2019 10:42:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549276938; bh=/TC+KE8hS3pRGuRvIbgQINe684B2u1tsl/t821vNJos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uV2G6wj5mDnpRg7tEPqfCy9eHproLsHpa6+dR4siyxNB7XkWVJg8Kd7EIoB+TEqt+ +xZLj1KwtyTJxZl/xmtHcTCBFpf06EIlu8TL6AQ7+g50vRuQkojxCGhe+uJRmhLgc2 Qbv7BlE5GNOmd5BIthaoCQG4o0fNdlCNxpN0zDLs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730513AbfBDKmR (ORCPT ); Mon, 4 Feb 2019 05:42:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:40208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729692AbfBDKmP (ORCPT ); Mon, 4 Feb 2019 05:42:15 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1E7672070C; Mon, 4 Feb 2019 10:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549276934; bh=/TC+KE8hS3pRGuRvIbgQINe684B2u1tsl/t821vNJos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1FS2kA19JEydE04CIuqpku+MTsYRjqA4ydw05X7cUKycQJvMbh/xMWcsJE8P+l5kW /iXzvnnPkwgxfFgfRRFmgIVID9Myf7FJvfcpVdYNER3US547SG1gRmfWkREPVqQf+g gh63SbyC1MvlJ8es/PO923OaLFGGY4riN4ohGwmw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Gruenbacher , Bob Peterson , Linus Torvalds Subject: [PATCH 4.4 46/65] gfs2: Revert "Fix loop in gfs2_rbm_find" Date: Mon, 4 Feb 2019 11:36:39 +0100 Message-Id: <20190204103618.357460600@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103610.583715954@linuxfoundation.org> References: <20190204103610.583715954@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andreas Gruenbacher commit e74c98ca2d6ae4376cc15fa2a22483430909d96b upstream. This reverts commit 2d29f6b96d8f80322ed2dd895bca590491c38d34. It turns out that the fix can lead to a ~20 percent performance regression in initial writes to the page cache according to iozone. Let's revert this for now to have more time for a proper fix. Cc: stable@vger.kernel.org # v3.13+ Signed-off-by: Andreas Gruenbacher Signed-off-by: Bob Peterson Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- fs/gfs2/rgrp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -1720,9 +1720,9 @@ static int gfs2_rbm_find(struct gfs2_rbm goto next_iter; } if (ret == -E2BIG) { - n += rbm->bii - initial_bii; rbm->bii = 0; rbm->offset = 0; + n += (rbm->bii - initial_bii); goto res_covered_end_of_rgrp; } return ret;