qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-05 10:42:50 +02:00
Code

fix 2.6.31 compile with union mounts disabled

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17730 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-09-26 08:52:09 +00:00
parent 2dee5f79dd
commit 82bbacf365
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/generic-2.6/patches-2.6.31/230-union_mounts.patch
View File

@ -4901,8 +4901,8 @@
+#define IS_MNT_UNION(x) (0) +#define IS_MNT_UNION(x) (0)
+#define is_unionized(x, y) (0) +#define is_unionized(x, y) (0)
+#define append_to_union(x1, y1, x2, y2) ({ BUG(); (0); }) +#define append_to_union(x1, y1, x2, y2) ({ BUG(); (0); })
+#define follow_union_down(x, y) ({ (0); }) +#define follow_union_down(x) ({ (0); })
+#define follow_union_mount(x, y) ({ (0); }) +#define follow_union_mount(x) ({ (0); })
+#define __d_drop_unions(x) do { } while (0) +#define __d_drop_unions(x) do { } while (0)
+#define shrink_d_unions(x) do { } while (0) +#define shrink_d_unions(x) do { } while (0)
+#define __shrink_d_unions(x,y) do { } while (0) +#define __shrink_d_unions(x,y) do { } while (0)

11
target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/include/linux/union.h
+++ b/include/linux/union.h
@@ -77,7 +77,7 @@
#define __union_copyup(x, y, z) ({ BUG(); (0); })
#define union_copyup(x, y) ({ (0); })
#define union_copyup_dir(x) ({ BUG(); (0); })
-#define union_permission(x, y) inode_permission(x->dentry->d_inode, y)
+#define union_permission(x, y) inode_permission((x)->dentry->d_inode, y)
#endif /* CONFIG_UNION_MOUNT */
#endif /* __KERNEL__ */