1 files changed, 58 insertions, 61 deletions
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index 75bb316529dd..427a4e82a588 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -16,44 +16,53 @@
 # Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
-ccflags-y := -I$(src) -I$(src)/linux-2.6
+ccflags-y += -I$(src)                   # needed for trace events
-ccflags-$(CONFIG_XFS_DEBUG) += -g
-XFS_LINUX := linux-2.6
+ccflags-$(CONFIG_XFS_DEBUG) += -g
 obj-$(CONFIG_XFS_FS)            += xfs.o
-xfs-y                           += linux-2.6/xfs_trace.o
+# this one should be compiled first, as the tracing macros can easily blow up
+xfs-y                           += xfs_trace.o
-xfs-$(CONFIG_XFS_QUOTA)         += $(addprefix quota/, \
-                                   xfs_dquot.o \
-                                   xfs_dquot_item.o \
-                                   xfs_trans_dquot.o \
-                                   xfs_qm_syscalls.o \
-                                   xfs_qm_bhv.o \
-                                   xfs_qm.o)
-xfs-$(CONFIG_XFS_QUOTA)         += linux-2.6/xfs_quotaops.o
-ifeq ($(CONFIG_XFS_QUOTA),y)
-xfs-$(CONFIG_PROC_FS)           += quota/xfs_qm_stats.o
-endif
-xfs-$(CONFIG_XFS_RT)            += xfs_rtalloc.o
-xfs-$(CONFIG_XFS_POSIX_ACL)     += $(XFS_LINUX)/xfs_acl.o
-xfs-$(CONFIG_PROC_FS)           += $(XFS_LINUX)/xfs_stats.o
-xfs-$(CONFIG_SYSCTL)            += $(XFS_LINUX)/xfs_sysctl.o
-xfs-$(CONFIG_COMPAT)            += $(XFS_LINUX)/xfs_ioctl32.o
+# highlevel code
+xfs-y                           += xfs_aops.o \
+                                   xfs_bit.o \
+                                   xfs_buf.o \
+                                   xfs_dfrag.o \
+                                   xfs_discard.o \
+                                   xfs_error.o \
+                                   xfs_export.o \
+                                   xfs_file.o \
+                                   xfs_filestream.o \
+                                   xfs_fsops.o \
+                                   xfs_fs_subr.o \
+                                   xfs_globals.o \
+                                   xfs_iget.o \
+                                   xfs_ioctl.o \
+                                   xfs_iomap.o \
+                                   xfs_iops.o \
+                                   xfs_itable.o \
+                                   xfs_message.o \
+                                   xfs_mru_cache.o \
+                                   xfs_super.o \
+                                   xfs_sync.o \
+                                   xfs_xattr.o \
+                                   xfs_rename.o \
+                                   xfs_rw.o \
+                                   xfs_utils.o \
+                                   xfs_vnodeops.o \
+                                   kmem.o \
+                                   uuid.o
+# code shared with libxfs
 xfs-y                           += xfs_alloc.o \
                                   xfs_alloc_btree.o \
                                   xfs_attr.o \
                                   xfs_attr_leaf.o \
-                                   xfs_bit.o \
                                   xfs_bmap.o \
                                   xfs_bmap_btree.o \
                                   xfs_btree.o \
-                                   xfs_buf_item.o \
                                   xfs_da_btree.o \
                                   xfs_dir2.o \
                                   xfs_dir2_block.o \
@@ -61,49 +70,37 @@ xfs-y				+= xfs_alloc.o \
                                   xfs_dir2_leaf.o \
                                   xfs_dir2_node.o \
                                   xfs_dir2_sf.o \
-                                   xfs_error.o \
-                                   xfs_extfree_item.o \
-                                   xfs_filestream.o \
-                                   xfs_fsops.o \
                                   xfs_ialloc.o \
                                   xfs_ialloc_btree.o \
-                                   xfs_iget.o \
                                   xfs_inode.o \
-                                   xfs_inode_item.o \
-                                   xfs_iomap.o \
-                                   xfs_itable.o \
-                                   xfs_dfrag.o \
-                                   xfs_log.o \
-                                   xfs_log_cil.o \
                                   xfs_log_recover.o \
                                   xfs_mount.o \
-                                   xfs_mru_cache.o \
+                                   xfs_trans.o
-                                   xfs_rename.o \
-                                   xfs_trans.o \
+# low-level transaction/log code
+xfs-y                           += xfs_log.o \
+                                   xfs_log_cil.o \
+                                   xfs_buf_item.o \
+                                   xfs_extfree_item.o \
+                                   xfs_inode_item.o \
                                   xfs_trans_ail.o \
                                   xfs_trans_buf.o \
                                   xfs_trans_extfree.o \
                                   xfs_trans_inode.o \
-                                   xfs_utils.o \
-                                   xfs_vnodeops.o \
-                                   xfs_rw.o
-# Objects in linux/
-xfs-y                           += $(addprefix $(XFS_LINUX)/, \
-                                   kmem.o \
-                                   xfs_aops.o \
-                                   xfs_buf.o \
-                                   xfs_discard.o \
-                                   xfs_export.o \
-                                   xfs_file.o \
-                                   xfs_fs_subr.o \
-                                   xfs_globals.o \
-                                   xfs_ioctl.o \
-                                   xfs_iops.o \
-                                   xfs_message.o \
-                                   xfs_super.o \
-                                   xfs_sync.o \
-                                   xfs_xattr.o)
-# Objects in support/
+# optional features
-xfs-y                           += support/uuid.o
+xfs-$(CONFIG_XFS_QUOTA)         += xfs_dquot.o \
+                                   xfs_dquot_item.o \
+                                   xfs_trans_dquot.o \
+                                   xfs_qm_syscalls.o \
+                                   xfs_qm_bhv.o \
+                                   xfs_qm.o \
+                                   xfs_quotaops.o
+ifeq ($(CONFIG_XFS_QUOTA),y)
+xfs-$(CONFIG_PROC_FS)           += xfs_qm_stats.o
+endif
+xfs-$(CONFIG_XFS_RT)            += xfs_rtalloc.o
+xfs-$(CONFIG_XFS_POSIX_ACL)     += xfs_acl.o
+xfs-$(CONFIG_PROC_FS)           += xfs_stats.o
+xfs-$(CONFIG_SYSCTL)            += xfs_sysctl.o
+xfs-$(CONFIG_COMPAT)            += xfs_ioctl32.o

diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index 75bb316529dd..427a4e82a588 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile
@@ -16,44 +16,53 @@
16	# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA	16	# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17	#	17	#
18		18
19	ccflags-y := -I$(src) -I$(src)/linux-2.6	19	ccflags-y += -I$(src) # needed for trace events
20	ccflags-$(CONFIG_XFS_DEBUG) += -g
21		20
22	XFS_LINUX := linux-2.6	21	ccflags-$(CONFIG_XFS_DEBUG) += -g
23		22
24	obj-$(CONFIG_XFS_FS) += xfs.o	23	obj-$(CONFIG_XFS_FS) += xfs.o
25		24
26	xfs-y += linux-2.6/xfs_trace.o	25	# this one should be compiled first, as the tracing macros can easily blow up
27		26	xfs-y += xfs_trace.o
28	xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \
29	xfs_dquot.o \
30	xfs_dquot_item.o \
31	xfs_trans_dquot.o \
32	xfs_qm_syscalls.o \
33	xfs_qm_bhv.o \
34	xfs_qm.o)
35	xfs-$(CONFIG_XFS_QUOTA) += linux-2.6/xfs_quotaops.o
36
37	ifeq ($(CONFIG_XFS_QUOTA),y)
38	xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o
39	endif
40
41	xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
42	xfs-$(CONFIG_XFS_POSIX_ACL) += $(XFS_LINUX)/xfs_acl.o
43	xfs-$(CONFIG_PROC_FS) += $(XFS_LINUX)/xfs_stats.o
44	xfs-$(CONFIG_SYSCTL) += $(XFS_LINUX)/xfs_sysctl.o
45	xfs-$(CONFIG_COMPAT) += $(XFS_LINUX)/xfs_ioctl32.o
46		27
		28	# highlevel code
		29	xfs-y += xfs_aops.o \
		30	xfs_bit.o \
		31	xfs_buf.o \
		32	xfs_dfrag.o \
		33	xfs_discard.o \
		34	xfs_error.o \
		35	xfs_export.o \
		36	xfs_file.o \
		37	xfs_filestream.o \
		38	xfs_fsops.o \
		39	xfs_fs_subr.o \
		40	xfs_globals.o \
		41	xfs_iget.o \
		42	xfs_ioctl.o \
		43	xfs_iomap.o \
		44	xfs_iops.o \
		45	xfs_itable.o \
		46	xfs_message.o \
		47	xfs_mru_cache.o \
		48	xfs_super.o \
		49	xfs_sync.o \
		50	xfs_xattr.o \
		51	xfs_rename.o \
		52	xfs_rw.o \
		53	xfs_utils.o \
		54	xfs_vnodeops.o \
		55	kmem.o \
		56	uuid.o
47		57
		58	# code shared with libxfs
48	xfs-y += xfs_alloc.o \	59	xfs-y += xfs_alloc.o \
49	xfs_alloc_btree.o \	60	xfs_alloc_btree.o \
50	xfs_attr.o \	61	xfs_attr.o \
51	xfs_attr_leaf.o \	62	xfs_attr_leaf.o \
52	xfs_bit.o \
53	xfs_bmap.o \	63	xfs_bmap.o \
54	xfs_bmap_btree.o \	64	xfs_bmap_btree.o \
55	xfs_btree.o \	65	xfs_btree.o \
56	xfs_buf_item.o \
57	xfs_da_btree.o \	66	xfs_da_btree.o \
58	xfs_dir2.o \	67	xfs_dir2.o \
59	xfs_dir2_block.o \	68	xfs_dir2_block.o \
@@ -61,49 +70,37 @@ xfs-y += xfs_alloc.o \
61	xfs_dir2_leaf.o \	70	xfs_dir2_leaf.o \
62	xfs_dir2_node.o \	71	xfs_dir2_node.o \
63	xfs_dir2_sf.o \	72	xfs_dir2_sf.o \
64	xfs_error.o \
65	xfs_extfree_item.o \
66	xfs_filestream.o \
67	xfs_fsops.o \
68	xfs_ialloc.o \	73	xfs_ialloc.o \
69	xfs_ialloc_btree.o \	74	xfs_ialloc_btree.o \
70	xfs_iget.o \
71	xfs_inode.o \	75	xfs_inode.o \
72	xfs_inode_item.o \
73	xfs_iomap.o \
74	xfs_itable.o \
75	xfs_dfrag.o \
76	xfs_log.o \
77	xfs_log_cil.o \
78	xfs_log_recover.o \	76	xfs_log_recover.o \
79	xfs_mount.o \	77	xfs_mount.o \
80	xfs_mru_cache.o \	78	xfs_trans.o
81	xfs_rename.o \	79
82	xfs_trans.o \	80	# low-level transaction/log code
		81	xfs-y += xfs_log.o \
		82	xfs_log_cil.o \
		83	xfs_buf_item.o \
		84	xfs_extfree_item.o \
		85	xfs_inode_item.o \
83	xfs_trans_ail.o \	86	xfs_trans_ail.o \
84	xfs_trans_buf.o \	87	xfs_trans_buf.o \
85	xfs_trans_extfree.o \	88	xfs_trans_extfree.o \
86	xfs_trans_inode.o \	89	xfs_trans_inode.o \
87	xfs_utils.o \
88	xfs_vnodeops.o \
89	xfs_rw.o
90
91	# Objects in linux/
92	xfs-y += $(addprefix $(XFS_LINUX)/, \
93	kmem.o \
94	xfs_aops.o \
95	xfs_buf.o \
96	xfs_discard.o \
97	xfs_export.o \
98	xfs_file.o \
99	xfs_fs_subr.o \
100	xfs_globals.o \
101	xfs_ioctl.o \
102	xfs_iops.o \
103	xfs_message.o \
104	xfs_super.o \
105	xfs_sync.o \
106	xfs_xattr.o)
107		90
108	# Objects in support/	91	# optional features
109	xfs-y += support/uuid.o	92	xfs-$(CONFIG_XFS_QUOTA) += xfs_dquot.o \
		93	xfs_dquot_item.o \
		94	xfs_trans_dquot.o \
		95	xfs_qm_syscalls.o \
		96	xfs_qm_bhv.o \
		97	xfs_qm.o \
		98	xfs_quotaops.o
		99	ifeq ($(CONFIG_XFS_QUOTA),y)
		100	xfs-$(CONFIG_PROC_FS) += xfs_qm_stats.o
		101	endif
		102	xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
		103	xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
		104	xfs-$(CONFIG_PROC_FS) += xfs_stats.o
		105	xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o
		106	xfs-$(CONFIG_COMPAT) += xfs_ioctl32.o