From patchwork Thu Sep 13 16:56:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 969459 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42B4YT55kGz9s4V; Fri, 14 Sep 2018 02:56:29 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1g0Uul-0003Rk-Vm; Thu, 13 Sep 2018 16:56:23 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1g0Uuk-0003RH-63 for kernel-team@lists.ubuntu.com; Thu, 13 Sep 2018 16:56:22 +0000 Received: from mail-wr1-f71.google.com ([209.85.221.71]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1g0Uuj-0004OZ-Un for kernel-team@lists.ubuntu.com; Thu, 13 Sep 2018 16:56:21 +0000 Received: by mail-wr1-f71.google.com with SMTP id z77-v6so5844574wrb.20 for ; Thu, 13 Sep 2018 09:56:21 -0700 (PDT) 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=pomPci3sNWY23TwM2pIjlJXkXRfxx2frrqcVaxPCRFA=; b=fdqdEtu1uc7lotv9S9W7VUE9WMe5oltzrzrl2A4vbX+0rx8SikgGHtLD54N/pGZHOT V80GbNIGTejI3ToHZX0nW3BEB9ygy74C91N1nRrtcY0U1bhIRnW02XHlOB7D9egp0GN/ W19m/HTEpBDQtmRWQjwZ2gBwh5m6dnyvmil8ksaqlaiyVPLjtJdqSZ8QtgcIRl2iTAhb YdrN6z7oSDI0gH7H8LQ6qQpgVOngZxW2oWW2m9gcyEqjpE/KO7fCPDsj0PSWxu6hjoLw oilTQkaViKNIOhpscrImxLzRW7Zc3H0nZTb5btXdLsommK6ve1PRxEbWQmF1xR92uu8v Jt4A== X-Gm-Message-State: APzg51BCewDdZ+qrlRJEo8oxegsLjTzNIN9GJbvpWP8Oi3yzrPg5ICtL oxoycqr4xsit1r1dQWkkBuGzU9IQ188J3R//SkIMoLwrf2ZJoHKdaJ6LT+g3oR+Z4lpCG+EeDbq sQhqu76kd2epWEiOf1dTWfdnaTURV+wlNvJ+Jln6wzw== X-Received: by 2002:a1c:5e08:: with SMTP id s8-v6mr6484663wmb.88.1536857781266; Thu, 13 Sep 2018 09:56:21 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYvhEK0mGFmMCe/Oqd1WzxkE8Gg9HQAJ3C/VP2nOsUp/YmYkM6vchzQ0vW4VFobFsowPtn3Yw== X-Received: by 2002:a1c:5e08:: with SMTP id s8-v6mr6484646wmb.88.1536857780985; Thu, 13 Sep 2018 09:56:20 -0700 (PDT) Received: from localhost ([2a02:8109:98c0:1604:34b0:1c10:9745:7766]) by smtp.gmail.com with ESMTPSA id e141-v6sm7010776wmd.32.2018.09.13.09.56.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Sep 2018 09:56:20 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][linux/linux-gcp][PATCH 1/1] UBUNTU: SAUCE: xfs: fix build error with CONFIG_XFS_ONLINE_SCRUB enabled Date: Thu, 13 Sep 2018 18:56:16 +0200 Message-Id: <20180913165616.20361-2-kleber.souza@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180913165616.20361-1-kleber.souza@canonical.com> References: <20180913165616.20361-1-kleber.souza@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1792393 The backport of a78ee256c325 ("xfs: convert XFS_AGFL_SIZE to a helper function") was incomplete, missing the replacement of XFS_AGFL_SIZE() by xfs_agfl_size() on fs/xfs/scrub/agheader.c. This file is only compiled with CONFIG_XFS_ONLINE_SCRUB enabled. Signed-off-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader --- fs/xfs/scrub/agheader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/xfs/scrub/agheader.c b/fs/xfs/scrub/agheader.c index 2a9b4f9e93c6..6cd3d32dcbc2 100644 --- a/fs/xfs/scrub/agheader.c +++ b/fs/xfs/scrub/agheader.c @@ -93,7 +93,7 @@ xfs_scrub_walk_agfl( } /* first to the end */ - for (i = flfirst; i < XFS_AGFL_SIZE(mp); i++) { + for (i = flfirst; i < xfs_agfl_size(mp); i++) { error = fn(sc, be32_to_cpu(agfl_bno[i]), priv); if (error) return error; @@ -466,7 +466,7 @@ xfs_scrub_agf( if (agfl_last > agfl_first) fl_count = agfl_last - agfl_first + 1; else - fl_count = XFS_AGFL_SIZE(mp) - agfl_first + agfl_last + 1; + fl_count = xfs_agfl_size(mp) - agfl_first + agfl_last + 1; if (agfl_count != 0 && fl_count != agfl_count) xfs_scrub_block_set_corrupt(sc, sc->sa.agf_bp); @@ -536,7 +536,7 @@ xfs_scrub_agfl( /* Allocate buffer to ensure uniqueness of AGFL entries. */ agf = XFS_BUF_TO_AGF(sc->sa.agf_bp); agflcount = be32_to_cpu(agf->agf_flcount); - if (agflcount > XFS_AGFL_SIZE(sc->mp)) { + if (agflcount > xfs_agfl_size(sc->mp)) { xfs_scrub_block_set_corrupt(sc, sc->sa.agf_bp); goto out; }