<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">
From: Tom Rini &lt;trini@kernel.crashing.org&gt;

Hello.  After 2.6.8.1, samba userland would no longer build with current
kernel headers, as it needs some of the samba kernel headers to work,
yet they included &lt;linux/fs.h&gt; outside of __KERNEL__, and after 2.6.9
this was no longer safe, and caused compilation to fail like this:
Compiling client/smbmount.c
In file included from /fdb041101/montavista/foundation/devkit/ppc/74xx/bin/../ta
rget/usr/include/linux/fs.h:19,
                 from /fdb041101/montavista/foundation/devkit/ppc/74xx/bin/../ta
rget/usr/include/linux/smb_fs.h:15,
                 from ../source/client/smbmount.c:27:
/fdb041101/montavista/foundation/devkit/ppc/74xx/bin/../target/usr/include/linux
/prio_tree.h:22: error: parse error before "pgoff_t"
/fdb041101/montavista/foundation/devkit/ppc/74xx/bin/../target/usr/include/linux
/prio_tree.h:27: error: parse error before "pgoff_t"
The simple fix is to move &lt;linux/fs.h&gt; down below the __KERNEL__ test.

Signed-off-by: Tom Rini &lt;trini@kernel.crashing.org&gt;
Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
---

 25-akpm/include/linux/smb_fs.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN include/linux/smb_fs.h~fix-building-of-samba-userland include/linux/smb_fs.h
--- 25/include/linux/smb_fs.h~fix-building-of-samba-userland	2004-11-03 22:01:33.359025640 -0800
+++ 25-akpm/include/linux/smb_fs.h	2004-11-03 22:01:33.362025184 -0800
@@ -12,7 +12,6 @@
 #include &lt;linux/smb.h&gt;
 #include &lt;linux/smb_fs_i.h&gt;
 #include &lt;linux/smb_fs_sb.h&gt;
-#include &lt;linux/fs.h&gt;
 
 /*
  * ioctl commands
@@ -26,6 +25,7 @@
 
 #ifdef __KERNEL__
 
+#include &lt;linux/fs.h&gt;
 #include &lt;linux/pagemap.h&gt;
 #include &lt;linux/vmalloc.h&gt;
 #include &lt;linux/smb_mount.h&gt;
_
</pre></body></html>