Skip to contentSkip to conversation

Re-order <linux/fs.h> includes to fix userland breakage

2.6.11-rc4 i386 Tom Rini 3 participants 3 messages Feb 22, 2005 – Feb 23, 2005 VFS

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

The following moves all includes <linux/fs.h> (except <linux/ioctl.h> and <linux/config.h> down to below the existing __KERNEL__ test. None of these includes are needed by the user-visible portions of the header, and in some cases can cause userland apps to break. For example, LTP and sash with an empty <linux/autoconf.h> will fail thusly:
cc -Wall -I../../include -g -Wall -I../../../../include -Wall setrlimit02.c -L../../../../lib -lltp -o setrlimit02
In file included from /usr/include/asm/atomic.h:6,

                 from /usr/include/linux/fs.h:20,
                 from setrlimit02.c:46:

/usr/include/asm/processor.h:68: error: `CONFIG_X86_L1_CACHE_SHIFT' undeclared here (not in a function) /usr/include/asm/processor.h:68: error: requested alignment is not a constant

Build/run tested with a glibc rebuild as well.

===== include/linux/fs.h 1.376 vs edited =====

include/linux/fs.h +19 -18
@@ -7,25 +7,7 @@
  */
 
 #include <linux/config.h>
-#include <linux/linkage.h>
-#include <linux/limits.h>
-#include <linux/wait.h>
-#include <linux/types.h>
-#include <linux/kdev_t.h>
 #include <linux/ioctl.h>
-#include <linux/dcache.h>
-#include <linux/stat.h>
-#include <linux/cache.h>
-#include <linux/kobject.h>
-#include <asm/atomic.h>
-
-struct iovec;
-struct nameidata;
-struct pipe_inode_info;
-struct poll_table_struct;
-struct kstatfs;
-struct vm_area_struct;
-struct vfsmount;
 
 /*
  * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
@@ -216,13 +198,32 @@ extern int dir_notify_enable;
 
 #ifdef __KERNEL__
 
+#include <linux/linkage.h>
+#include <linux/limits.h>
+#include <linux/wait.h>
+#include <linux/types.h>
+#include <linux/kdev_t.h>
+#include <linux/dcache.h>
+#include <linux/stat.h>
+#include <linux/cache.h>
+#include <linux/kobject.h>
 #include <linux/list.h>
 #include <linux/radix-tree.h>
 #include <linux/prio_tree.h>
 #include <linux/audit.h>
 #include <linux/init.h>
+
+#include <asm/atomic.h>
 #include <asm/semaphore.h>
 #include <asm/byteorder.h>
+
+struct iovec;
+struct nameidata;
+struct pipe_inode_info;
+struct poll_table_struct;
+struct kstatfs;
+struct vm_area_struct;
+struct vfsmount;
 
 /* Used to be a macro which just called the function, now just a function */
 extern void update_atime (struct inode *);
Signature · 2 lines
Tom Rini
http://gate.crashing.org/~trini/
#1 lore raw
Quoted 11 lines · * Tom Rini ([email protected]) wrote:

The following moves all includes <linux/fs.h> (except <linux/ioctl.h> and <linux/config.h> down to below the existing __KERNEL__ test. None of these includes are needed by the user-visible portions of the header, and in some cases can cause userland apps to break. For example, LTP and sash with an empty <linux/autoconf.h> will fail thusly:
cc -Wall -I../../include -g -Wall -I../../../../include -Wall setrlimit02.c -L../../../../lib -lltp -o setrlimit02
In file included from /usr/include/asm/atomic.h:6,

                 from /usr/include/linux/fs.h:20,
                 from setrlimit02.c:46:

/usr/include/asm/processor.h:68: error: `CONFIG_X86_L1_CACHE_SHIFT' undeclared here (not in a function) /usr/include/asm/processor.h:68: error: requested alignment is not a constant

This change is spewing warnings like:

CC init/main.o
In file included from include/linux/fs.h:202,

                 from include/linux/proc_fs.h:6,
                 from init/main.c:17:
include/linux/limits.h:4:1: warning: "NR_OPEN" redefined
In file included from include/linux/proc_fs.h:6,
                 from init/main.c:17:

include/linux/fs.h:24:1: warning: this is the location of the previous definition
CC init/do_mounts.o
In file included from include/linux/fs.h:202,
from include/linux/tty.h:20,
from init/do_mounts.c:5:
include/linux/limits.h:4:1: warning: "NR_OPEN" redefined
In file included from include/linux/tty.h:20,
from init/do_mounts.c:5:
include/linux/fs.h:24:1: warning: this is the location of the previous definition

Move limits.h include back above __KERNEL__ to quiet things back down.

===== include/linux/fs.h 1.377 vs edited =====

include/linux/fs.h +1 -1
@@ -8,6 +8,7 @@
 
 #include <linux/config.h>
 #include <linux/ioctl.h>
+#include <linux/limits.h>
 
 /*
  * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
@@ -199,7 +200,6 @@ extern int dir_notify_enable;
 #ifdef __KERNEL__
 
 #include <linux/linkage.h>
-#include <linux/limits.h>
 #include <linux/wait.h>
 #include <linux/types.h>
 #include <linux/kdev_t.h>
#2 lore raw
Quoted 2 lines · Chris Wright

This change is spewing warnings like:

Already fixed in BK.

Linus