Skip to content

Commit c59d87c

Browse files
Christoph HellwigAlex Elder
Christoph Hellwig
authored and
Alex Elder
committed
xfs: remove subdirectories
Use the move from Linux 2.6 to Linux 3.x as an excuse to kill the annoying subdirectories in the XFS source code. Besides the large amount of file rename the only changes are to the Makefile, a few files including headers with the subdirectory prefix, and the binary sysctl compat code that includes a header under fs/xfs/ from kernel/. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Alex Elder <aelder@sgi.com>
1 parent 06f8e2d commit c59d87c

55 files changed

Lines changed: 58 additions & 63 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎fs/xfs/Makefile‎

Lines changed: 56 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -16,94 +16,89 @@
1616
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
#
1818

19-
ccflags-y := -I$(src) -I$(src)/linux-2.6 -I$(src)/quota -I$(src)/support
2019
ccflags-$(CONFIG_XFS_DEBUG) += -g
2120

22-
XFS_LINUX := linux-2.6
23-
2421
obj-$(CONFIG_XFS_FS) += xfs.o
2522

26-
xfs-y += linux-2.6/xfs_trace.o
27-
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
23+
# this one should be compiled first, as the tracing macros can easily blow up
24+
xfs-y += xfs_trace.o
4625

26+
# highlevel code
27+
xfs-y += xfs_aops.o \
28+
xfs_bit.o \
29+
xfs_buf.o \
30+
xfs_dfrag.o \
31+
xfs_discard.o \
32+
xfs_error.o \
33+
xfs_export.o \
34+
xfs_file.o \
35+
xfs_filestream.o \
36+
xfs_fsops.o \
37+
xfs_fs_subr.o \
38+
xfs_globals.o \
39+
xfs_iget.o \
40+
xfs_ioctl.o \
41+
xfs_iomap.o \
42+
xfs_iops.o \
43+
xfs_itable.o \
44+
xfs_message.o \
45+
xfs_mru_cache.o \
46+
xfs_super.o \
47+
xfs_sync.o \
48+
xfs_xattr.o \
49+
xfs_rename.o \
50+
xfs_rw.o \
51+
xfs_utils.o \
52+
xfs_vnodeops.o \
53+
kmem.o \
54+
uuid.o
4755

56+
# code shared with libxfs
4857
xfs-y += xfs_alloc.o \
4958
xfs_alloc_btree.o \
5059
xfs_attr.o \
5160
xfs_attr_leaf.o \
52-
xfs_bit.o \
5361
xfs_bmap.o \
5462
xfs_bmap_btree.o \
5563
xfs_btree.o \
56-
xfs_buf_item.o \
5764
xfs_da_btree.o \
5865
xfs_dir2.o \
5966
xfs_dir2_block.o \
6067
xfs_dir2_data.o \
6168
xfs_dir2_leaf.o \
6269
xfs_dir2_node.o \
6370
xfs_dir2_sf.o \
64-
xfs_error.o \
65-
xfs_extfree_item.o \
66-
xfs_filestream.o \
67-
xfs_fsops.o \
6871
xfs_ialloc.o \
6972
xfs_ialloc_btree.o \
70-
xfs_iget.o \
7173
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 \
7874
xfs_log_recover.o \
7975
xfs_mount.o \
80-
xfs_mru_cache.o \
81-
xfs_rename.o \
82-
xfs_trans.o \
76+
xfs_trans.o
77+
78+
# low-level transaction/log code
79+
xfs-y += xfs_log.o \
80+
xfs_log_cil.o \
81+
xfs_buf_item.o \
82+
xfs_extfree_item.o \
83+
xfs_inode_item.o \
8384
xfs_trans_ail.o \
8485
xfs_trans_buf.o \
8586
xfs_trans_extfree.o \
8687
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)
10788

108-
# Objects in support/
109-
xfs-y += support/uuid.o
89+
# optional features
90+
xfs-$(CONFIG_XFS_QUOTA) += xfs_dquot.o \
91+
xfs_dquot_item.o \
92+
xfs_trans_dquot.o \
93+
xfs_qm_syscalls.o \
94+
xfs_qm_bhv.o \
95+
xfs_qm.o \
96+
xfs_quotaops.o
97+
ifeq ($(CONFIG_XFS_QUOTA),y)
98+
xfs-$(CONFIG_PROC_FS) += xfs_qm_stats.o
99+
endif
100+
xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
101+
xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
102+
xfs-$(CONFIG_PROC_FS) += xfs_stats.o
103+
xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o
104+
xfs-$(CONFIG_COMPAT) += xfs_ioctl32.o

fs/xfs/linux-2.6/kmem.c renamed to fs/xfs/kmem.c

File renamed without changes.

fs/xfs/linux-2.6/kmem.h renamed to fs/xfs/kmem.h

File renamed without changes.

fs/xfs/linux-2.6/mrlock.h renamed to fs/xfs/mrlock.h

File renamed without changes.

fs/xfs/linux-2.6/time.h renamed to fs/xfs/time.h

File renamed without changes.

fs/xfs/support/uuid.c renamed to fs/xfs/uuid.c

File renamed without changes.

fs/xfs/support/uuid.h renamed to fs/xfs/uuid.h

File renamed without changes.

fs/xfs/linux-2.6/xfs_acl.c renamed to fs/xfs/xfs_acl.c

File renamed without changes.

fs/xfs/linux-2.6/xfs_aops.c renamed to fs/xfs/xfs_aops.c

File renamed without changes.

fs/xfs/linux-2.6/xfs_aops.h renamed to fs/xfs/xfs_aops.h

File renamed without changes.

0 commit comments

Comments
 (0)