Patchwork UBUNTU: AUFS -- Fix header files inclusion in debug.h

login
register
mail settings
Submitter Mirsal Ennaime
Date Feb. 9, 2010, 8:46 p.m.
Message ID <a8846f301002091246o6d2d85e7w4df76e3314a1298d@mail.gmail.com>
Download mbox | patch
Permalink /patch/44946/
State Accepted
Delegated to: Stefan Bader
Headers show

Comments

Mirsal Ennaime - Feb. 9, 2010, 8:46 p.m.
BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/517151

The aufs module fails to build with CONFIG_AUFS_DEBUG=y
The issue is not present in lucid because the whole driver code was synced
with the upstream aufs tree.

As I discussed with Andy Whitcroft on IRC, I'm not sure it justifies an SRU,
as it is unlikely that anyone would really want to build aufs with debugging
support from the karmic kernel sources package.

Signed-off-by: Mirsal Ennaime <mirsal.ennaime@gmail.com>
---
 ubuntu/aufs/debug.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Tim Gardner - Feb. 9, 2010, 9:13 p.m.
Mirsal Ennaime wrote:
> BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/517151
> 
> The aufs module fails to build with CONFIG_AUFS_DEBUG=y
> The issue is not present in lucid because the whole driver code was synced
> with the upstream aufs tree.
> 
> As I discussed with Andy Whitcroft on IRC, I'm not sure it justifies an SRU,
> as it is unlikely that anyone would really want to build aufs with debugging
> support from the karmic kernel sources package.
> 
> Signed-off-by: Mirsal Ennaime <mirsal.ennaime@gmail.com>
> ---
>  ubuntu/aufs/debug.h |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/ubuntu/aufs/debug.h b/ubuntu/aufs/debug.h
> index dab15f7..d22aff8 100644
> --- a/ubuntu/aufs/debug.h
> +++ b/ubuntu/aufs/debug.h
> @@ -25,9 +25,10 @@
> 
>  #ifdef __KERNEL__
> 
> +#include <asm/system.h>
>  #include <linux/bug.h>
>  /* #include <linux/err.h> */
> -/* #include <linux/init.h> */
> +#include <linux/init.h>
>  /* #include <linux/kernel.h> */
>  #include <linux/delay.h>
>  /* #include <linux/kd.h> */

I can think of at least one case recently where building with debug
would have been handy (though it was for Hardy).

Seems that there is little chance of regression with an additional
header file. It'll either build, or it won't. Check for new warnings.

Acked-by: Tim Gardner <tim.gardner@canonical.com>
Stefan Bader - Feb. 10, 2010, 9:48 a.m.
Mirsal Ennaime wrote:
> BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/517151
> 
> The aufs module fails to build with CONFIG_AUFS_DEBUG=y
> The issue is not present in lucid because the whole driver code was synced
> with the upstream aufs tree.
> 
> As I discussed with Andy Whitcroft on IRC, I'm not sure it justifies an SRU,
> as it is unlikely that anyone would really want to build aufs with debugging
> support from the karmic kernel sources package.

I guess I am with Tim. Don't think anybody would really care. It is probably
stretching SRU policy a bit, but it fixes a real bug (even if it is not
happening in our build). And it should really make no difference to have more
headers included (for other cases). I will take it now and have a look when it
compiles.


> Signed-off-by: Mirsal Ennaime <mirsal.ennaime@gmail.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  ubuntu/aufs/debug.h |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/ubuntu/aufs/debug.h b/ubuntu/aufs/debug.h
> index dab15f7..d22aff8 100644
> --- a/ubuntu/aufs/debug.h
> +++ b/ubuntu/aufs/debug.h
> @@ -25,9 +25,10 @@
> 
>  #ifdef __KERNEL__
> 
> +#include <asm/system.h>
>  #include <linux/bug.h>
>  /* #include <linux/err.h> */
> -/* #include <linux/init.h> */
> +#include <linux/init.h>
>  /* #include <linux/kernel.h> */
>  #include <linux/delay.h>
>  /* #include <linux/kd.h> */
Stefan Bader - Feb. 10, 2010, 7:47 p.m.
Applied to Karmic

Patch

diff --git a/ubuntu/aufs/debug.h b/ubuntu/aufs/debug.h
index dab15f7..d22aff8 100644
--- a/ubuntu/aufs/debug.h
+++ b/ubuntu/aufs/debug.h
@@ -25,9 +25,10 @@ 

 #ifdef __KERNEL__

+#include <asm/system.h>
 #include <linux/bug.h>
 /* #include <linux/err.h> */
-/* #include <linux/init.h> */
+#include <linux/init.h>
 /* #include <linux/kernel.h> */
 #include <linux/delay.h>
 /* #include <linux/kd.h> */