APPLIED[linux-gcp]: [SRU][Bionic][linux/linux-gcp][PATCH 0/1] Fix xfs build error

[Kleber Souza]

On 09/13/18 18:56, Kleber Sacilotto de Souza wrote:
> 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(-)
> 

Applied to bionic/linux-gcp/master-next branch.

NOTE: not applied to bionic/linux/master-next.

Thanks,
Kleber