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

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

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

Kleber Souza
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(-)

--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[SRU][Bionic][linux/linux-gcp][PATCH 1/1] UBUNTU: SAUCE: xfs: fix build error with CONFIG_XFS_ONLINE_SCRUB enabled

Kleber Souza
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 <[hidden email]>
---
 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;
  }
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Kamal Mostafa-2
In reply to this post by Kleber Souza

Acked-by: Kamal Mostafa <[hidden email]>

On Thu, Sep 13, 2018 at 06:56:15PM +0200, 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(-)
>
> --
> 2.17.1
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Kleber Souza
In reply to this post by 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

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [SRU][Bionic][linux/linux-gcp][PATCH 1/1] UBUNTU: SAUCE: xfs: fix build error with CONFIG_XFS_ONLINE_SCRUB enabled

Stefan Bader-2
In reply to this post by Kleber Souza
On 13.09.2018 18:56, Kleber Sacilotto de Souza wrote:
> 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 <[hidden email]>
Acked-by: Stefan Bader <[hidden email]>

> ---
>  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;
>   }
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

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

Kleber Souza
In reply to this post by 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/master-next branch.

Thanks,
Kleber

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team