From patchwork Thu Sep 13 16:56:15 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: 969458 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 42B4YS6KRGz9s9N; Fri, 14 Sep 2018 02:56:28 +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 1g0Uuj-0003R5-QX; Thu, 13 Sep 2018 16:56:21 +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 1g0Uui-0003Qt-74 for kernel-team@lists.ubuntu.com; Thu, 13 Sep 2018 16:56:20 +0000 Received: from mail-wr1-f69.google.com ([209.85.221.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1g0Uuh-0004OS-Vw for kernel-team@lists.ubuntu.com; Thu, 13 Sep 2018 16:56:19 +0000 Received: by mail-wr1-f69.google.com with SMTP id k1-v6so5864405wrl.13 for ; Thu, 13 Sep 2018 09:56:19 -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; bh=vjS1x2a2OxosS2FKjwK7r8swvgueFC9psoM3UGeoI+w=; b=G4ZdIqeQQAlzoAdFqI9jP1UVrBVZG49aj9Jfmy3j6NOBfzYjl9uSIUEZkDt1pBei1r oISqA1U7NdnPK8CDba37gxLebZk02GdedlMnoZm3Z2lo9ZO7+djfukWtSS8lfcHI+a4P a3C3nfrkKhmFULgagakRqbE4mDXmbWA+gfaeY3jU6l47SbWRi0iUdNTzroIng8DInvGI ES3Sm+JKcOyRDEq6cPTZ554e6yMk3s2x3QyOn0XN5QGfMouzp2iF9fhdpvBhmgQDd8di 7+vgGbAy/dl+ty5QmxqC6oTwSaN3sYjIGGu8HvMg03+5he4nXtBU3nAyaSlinId4AnaV nJqw== X-Gm-Message-State: APzg51DglyDlXidyIdMa1IIqEj/xXXfpGXErtENpbzSjFwfg7XZrum8R X6ZZsUupHTVRivjOdlQC89fPi191gw49gIC/AfsAWxxWLmvQgOiu4FHinq7QQRWZx+kvD4ZIQaQ zxCiMOgnDq5Nqxqe92XurZjqpyPALFssajFKZWlejWg== X-Received: by 2002:a1c:e3d5:: with SMTP id a204-v6mr5724959wmh.20.1536857779286; Thu, 13 Sep 2018 09:56:19 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb8x93TV3SoUpXFvlGgkfqhMIPbSELjMrxtk3HirdNVSCRqGfyqy17ApTWOQr2Dbw5Z1emERw== X-Received: by 2002:a1c:e3d5:: with SMTP id a204-v6mr5724949wmh.20.1536857778993; Thu, 13 Sep 2018 09:56:18 -0700 (PDT) Received: from localhost ([2a02:8109:98c0:1604:34b0:1c10:9745:7766]) by smtp.gmail.com with ESMTPSA id d22-v6sm8117651wra.80.2018.09.13.09.56.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Sep 2018 09:56:17 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][linux/linux-gcp][PATCH 0/1] Fix xfs build error Date: Thu, 13 Sep 2018 18:56:15 +0200 Message-Id: <20180913165616.20361-1-kleber.souza@canonical.com> X-Mailer: git-send-email 2.17.1 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" This issue has real impact only on linux-gcp, which is the only kernel that enables CONFIG_XFS_ONLINE_SCRUB. So I'm proposing the fix for bionic/linux-gcp to be applied to the current cycle, and for bionic/linux to fix it on the main kernel on a following cycle. The patch applied for gcp will be gone away on the next rebase. SRU Justification: Impact: The backport of a78ee256c325 ("xfs: convert XFS_AGFL_SIZE to a helper function") done as part of "Bionic update: upstream stable patchset 2018-08-24" (bug 1788897) is incomplete, causing the build to fail if CONFIG_XFS_ONLINE_SCRUB is selected. /tmp/kernel-kleber-79aa9f7-Y9dG/build/fs/xfs/scrub/agheader.c: In function 'xfs_scrub_walk_agfl': /tmp/kernel-kleber-79aa9f7-Y9dG/build/fs/xfs/scrub/agheader.c:96:24: error: implicit declaration of function 'XFS_AGFL_SIZE'; did you mean 'XFS_ACL_SIZE'? [-Werror=implicit-function-declaration] for (i = flfirst; i < XFS_AGFL_SIZE(mp); i++) { ^~~~~~~~~~~~~ XFS_ACL_SIZE The backport didn't replace all the occurrences of the XFS_AGFL_SIZE macro by the xfs_agfl_size function. Fix: A SAUCE patch is needed to fix the backport, given that the problem doesn't exist with mainline. Testcase: Enable CONFIG_XFS_ONLINE_SCRUB and compile the kernel. Kleber Sacilotto de Souza (1): UBUNTU: SAUCE: xfs: fix build error with CONFIG_XFS_ONLINE_SCRUB enabled fs/xfs/scrub/agheader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Acked-by: Kamal Mostafa