Skip to contentSkip to conversation

romfs: cleanup romfs_fs.h

PATCH In review Christoph Hellwig 2 participants 4 messages Apr 7, 2009 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 romfs: cleanup romfs_fs.h

There's no kernel-only content in it anymore, so move it to header-y and remove the superflous #ifdef __KERNEL__.

include/linux/Kbuild +1 -1
Index: linux-2.6/include/linux/Kbuild
===================================================================
@@ -138,6 +138,7 @@ header-y += qnxtypes.h
 header-y += radeonfb.h
 header-y += raw.h
 header-y += resource.h
+header-y += romfs_fs.h
 header-y += rose.h
 header-y += serial_reg.h
 header-y += smbno.h
@@ -314,7 +315,6 @@ unifdef-y += irqnr.h
 unifdef-y += reboot.h
 unifdef-y += reiserfs_fs.h
 unifdef-y += reiserfs_xattr.h
-unifdef-y += romfs_fs.h
 unifdef-y += route.h
 unifdef-y += rtc.h
 unifdef-y += rtnetlink.h
include/linux/romfs_fs.h +0 -5
Index: linux-2.6/include/linux/romfs_fs.h
===================================================================
@@ -53,9 +53,4 @@ struct romfs_inode {
 #define ROMFH_PAD (ROMFH_SIZE-1)
 #define ROMFH_MASK (~ROMFH_PAD)
 
-#ifdef __KERNEL__
-
-/* Not much now */
-
-#endif /* __KERNEL__ */
 #endif
#1 lore raw
Quoted 2 lines · Christoph Hellwig

There's no kernel-only content in it anymore, so move it to header-y and remove the superflous #ifdef __KERNEL__.

today there is no difference between header-y and unifdef-y. We pass everything through unifdef these days.

Sam

#2 lore raw
Quoted 6 lines · Sam Ravnborg
Quoted 2 lines · Christoph Hellwig

There's no kernel-only content in it anymore, so move it to header-y and remove the superflous #ifdef __KERNEL__.

today there is no difference between header-y and unifdef-y. We pass everything through unifdef these days.

The __KERNEL__ removal still applies, and as long as we have two different variables it should use the correct one.

But why do you send all through unifdef anyway? That's a pretty bad signal to send when we try to get people to do cleanly seprated headers.

#3 lore raw
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Sam Ravnborg
Quoted 2 lines · Christoph Hellwig

There's no kernel-only content in it anymore, so move it to header-y and remove the superflous #ifdef __KERNEL__.

Quoted 8 lines
Quoted 2 lines

today there is no difference between header-y and unifdef-y. We pass everything through unifdef these days.

The __KERNEL__ removal still applies, and as long as we have two different variables it should use the correct one.

But why do you send all through unifdef anyway? That's a pretty bad signal to send when we try to get people to do cleanly seprated headers.

We saw too many cases where headers was not assigned to unifdef-y after introducing "#ifdef __KERNEL__".
So we integrated the install and unifdef step to avoid this.
And with the header stuff in kbuild redesigned the cost was acceptable to do so.

When I get some spare time I plan to re-implement the unifdef tool so it does exactly what we want it to do so we can skip the perl/unifdef stuff we have today.

And I should sent a patch to Linus to get rid of unifdef-y so not to confuse people.

Sam