[PATCH 2/2] fs: don't include <linux/gfp.h> to fix headers-export-check

[PATCH 2/2] fs: don't include <linux/gfp.h> to fix headers-export-check

[Pekka Enberg]

From: Pekka Enberg <penberg@cs.helsinki.fi>

Impact: fix build

This patch fixes a headers-export-check failure:

  /home/mingo/tip/usr/include/linux/bsg.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h>
  /home/mingo/tip/usr/include/linux/fs.h:11: included file 'linux/gfp.h' is not exported
  make[3]: *** [/home/mingo/tip/usr/include/linux/.check] Error 1
  make[2]: *** [linux] Error 2

Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 include/linux/fs.h |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index add95da..11fdc57 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -8,7 +8,6 @@
 
 #include <linux/limits.h>
 #include <linux/ioctl.h>
-#include <linux/gfp.h>
 
 /*
  * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
@@ -2233,15 +2232,12 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf,
 
 
 #ifdef CONFIG_SECURITY
-static inline char *alloc_secdata(void)
-{
-	return (char *)get_zeroed_page(GFP_KERNEL);
-}
-
-static inline void free_secdata(void *secdata)
-{
-	free_page((unsigned long)secdata);
-}
+/*
+ * These need to be macros because we cannot include <linux/gfp.h> in this
+ * header file.
+ */
+#define alloc_secdata()       (char *)get_zeroed_page(GFP_KERNEL)
+#define free_secdata(secdata) free_page((unsigned long) secdata)
 #else
 static inline char *alloc_secdata(void)
 {
-- 
1.5.4.3

[tip:tracing/kmemtrace] fs: don't include <linux/gfp.h> to fix headers-export-check

[Pekka Enberg]

Commit-ID:  f9ebc8b5fa7b574df0f8d39643879edc77cb2fe2
Gitweb:     http://git.kernel.org/tip/f9ebc8b5fa7b574df0f8d39643879edc77cb2fe2
Author:     Pekka Enberg <penberg@cs.helsinki.fi>
AuthorDate: Tue, 24 Mar 2009 11:59:23 +0200
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 24 Mar 2009 11:04:19 +0100

fs: don't include <linux/gfp.h> to fix headers-export-check

Impact: fix build

This patch fixes a headers-export-check failure:

  /home/mingo/tip/usr/include/linux/bsg.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h>
  /home/mingo/tip/usr/include/linux/fs.h:11: included file 'linux/gfp.h' is not exported
  make[3]: *** [/home/mingo/tip/usr/include/linux/.check] Error 1
  make[2]: *** [linux] Error 2

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
LKML-Reference: <1237888763.25315.70.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 include/linux/fs.h |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index add95da..11fdc57 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -8,7 +8,6 @@
 
 #include <linux/limits.h>
 #include <linux/ioctl.h>
-#include <linux/gfp.h>
 
 /*
  * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
@@ -2233,15 +2232,12 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf,
 
 
 #ifdef CONFIG_SECURITY
-static inline char *alloc_secdata(void)
-{
-	return (char *)get_zeroed_page(GFP_KERNEL);
-}
-
-static inline void free_secdata(void *secdata)
-{
-	free_page((unsigned long)secdata);
-}
+/*
+ * These need to be macros because we cannot include <linux/gfp.h> in this
+ * header file.
+ */
+#define alloc_secdata()       (char *)get_zeroed_page(GFP_KERNEL)
+#define free_secdata(secdata) free_page((unsigned long) secdata)
 #else
 static inline char *alloc_secdata(void)
 {

Re: [PATCH 2/2] fs: don't include <linux/gfp.h> to fix headers-export-check

[Arnd Bergmann]

On Tuesday 24 March 2009, Pekka Enberg wrote:
>    
> From: Pekka Enberg <penberg@cs.helsinki.fi>
> 
> Impact: fix build
> 
> This patch fixes a headers-export-check failure:
> 
>   /home/mingo/tip/usr/include/linux/bsg.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h>
>   /home/mingo/tip/usr/include/linux/fs.h:11: included file 'linux/gfp.h' is not exported
>   make[3]: *** [/home/mingo/tip/usr/include/linux/.check] Error 1
>   make[2]: *** [linux] Error 2
> 
> Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
> ---
>  include/linux/fs.h |   16 ++++++----------
>  1 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index add95da..11fdc57 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -8,7 +8,6 @@
>  
>  #include <linux/limits.h>
>  #include <linux/ioctl.h>
> -#include <linux/gfp.h>
>  
>  /*

I think a cleaner fix would be to move the include of gfp.h into the
second #include block that is part of #ifdef __KERNEL__, as is the
only user of get_zeroed_page in there.

	Arnd <><

Re: [PATCH 2/2] fs: don't include <linux/gfp.h> to fix headers-export-check

[Pekka Enberg]

On Tue, 2009-03-24 at 14:12 +0100, Arnd Bergmann wrote:
> On Tuesday 24 March 2009, Pekka Enberg wrote:
> >    
> > From: Pekka Enberg <penberg@cs.helsinki.fi>
> > 
> > Impact: fix build
> > 
> > This patch fixes a headers-export-check failure:
> > 
> >   /home/mingo/tip/usr/include/linux/bsg.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h>
> >   /home/mingo/tip/usr/include/linux/fs.h:11: included file 'linux/gfp.h' is not exported
> >   make[3]: *** [/home/mingo/tip/usr/include/linux/.check] Error 1
> >   make[2]: *** [linux] Error 2
> > 
> > Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
> > Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
> > ---
> >  include/linux/fs.h |   16 ++++++----------
> >  1 files changed, 6 insertions(+), 10 deletions(-)
> > 
> > diff --git a/include/linux/fs.h b/include/linux/fs.h
> > index add95da..11fdc57 100644
> > --- a/include/linux/fs.h
> > +++ b/include/linux/fs.h
> > @@ -8,7 +8,6 @@
> >  
> >  #include <linux/limits.h>
> >  #include <linux/ioctl.h>
> > -#include <linux/gfp.h>
> >  
> >  /*
> 
> I think a cleaner fix would be to move the include of gfp.h into the
> second #include block that is part of #ifdef __KERNEL__, as is the
> only user of get_zeroed_page in there.

Alexey suggested putting the functions in security.h instead which is
even better. I'll submit that formally as soon as I have the chance to
test it.

			Pekka

Re: [PATCH 2/2] fs: don't include <linux/gfp.h> to fix headers-export-check

[Ingo Molnar]

* Pekka Enberg <penberg@cs.helsinki.fi> wrote:

> On Tue, 2009-03-24 at 14:12 +0100, Arnd Bergmann wrote:
> > On Tuesday 24 March 2009, Pekka Enberg wrote:
> > >    
> > > From: Pekka Enberg <penberg@cs.helsinki.fi>
> > > 
> > > Impact: fix build
> > > 
> > > This patch fixes a headers-export-check failure:
> > > 
> > >   /home/mingo/tip/usr/include/linux/bsg.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h>
> > >   /home/mingo/tip/usr/include/linux/fs.h:11: included file 'linux/gfp.h' is not exported
> > >   make[3]: *** [/home/mingo/tip/usr/include/linux/.check] Error 1
> > >   make[2]: *** [linux] Error 2
> > > 
> > > Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
> > > Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
> > > ---
> > >  include/linux/fs.h |   16 ++++++----------
> > >  1 files changed, 6 insertions(+), 10 deletions(-)
> > > 
> > > diff --git a/include/linux/fs.h b/include/linux/fs.h
> > > index add95da..11fdc57 100644
> > > --- a/include/linux/fs.h
> > > +++ b/include/linux/fs.h
> > > @@ -8,7 +8,6 @@
> > >  
> > >  #include <linux/limits.h>
> > >  #include <linux/ioctl.h>
> > > -#include <linux/gfp.h>
> > >  
> > >  /*
> > 
> > I think a cleaner fix would be to move the include of gfp.h into the
> > second #include block that is part of #ifdef __KERNEL__, as is the
> > only user of get_zeroed_page in there.
> 
> Alexey suggested putting the functions in security.h instead which 
> is even better. I'll submit that formally as soon as I have the 
> chance to test it.

yep. Hopefully it wont have ripple effects. The whole house of cards 
called include/linux/*.h seems to be imploding ;-)

	Ingo