Re: [PATCH] kmemtrace: fix build breakage in befs

[Pekka Enberg <penberg@cs.helsinki.fi>]

On Tue, 2009-03-24 at 16:09 +0300, Alexey Dobriyan wrote:
> On Tue, Mar 24, 2009 at 10:53:46AM +0100, Ingo Molnar wrote:
> > > -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);
> > > -}
> > > +#define alloc_secdata() (char *)get_zeroed_page(GFP_KERNEL)
> > > +#define free_secdata()  free_page((unsigned long) secdata)
> > 
> > yep, that would be fine - but please add a comment about why they 
> > are macros and what would have to be done to fix it.
> 
> Nooo!
> 
> Stick it into security.h!

Something like this untested patch?

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 11fdc57..159f7b8 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2230,24 +2230,6 @@ ssize_t simple_attr_read(struct file *file, char __user *buf,
 ssize_t simple_attr_write(struct file *file, const char __user *buf,
 			  size_t len, loff_t *ppos);
 
-
-#ifdef CONFIG_SECURITY
-/*
- * 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)
-{
-	return (char *)1;
-}
-
-static inline void free_secdata(void *secdata)
-{ }
-#endif	/* CONFIG_SECURITY */
-
 struct ctl_table;
 int proc_nr_files(struct ctl_table *table, int write, struct file *filp,
 		  void __user *buffer, size_t *lenp, loff_t *ppos);
diff --git a/include/linux/security.h b/include/linux/security.h
index 1f2ab63..e3e2f8a 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -32,6 +32,7 @@
 #include <linux/sched.h>
 #include <linux/key.h>
 #include <linux/xfrm.h>
+#include <linux/gfp.h>
 #include <net/flow.h>
 
 /* Maximum number of letters for an LSM name string */
@@ -2966,5 +2967,28 @@ static inline void securityfs_remove(struct dentry *dentry)
 
 #endif
 
+#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);
+}
+
+#else
+
+static inline char *alloc_secdata(void)
+{
+        return (char *)1;
+}
+
+static inline void free_secdata(void *secdata)
+{ }
+#endif /* CONFIG_SECURITY */
+
 #endif /* ! __LINUX_SECURITY_H */