Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c59d87c4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 06f8e2d6

fs/xfs/Makefile

+56 −61
Original line number Diff line number Diff line
@@ -16,44 +16,51 @@ 
# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

#



ccflags-y := -I$(src) -I$(src)/linux-2.6 -I$(src)/quota -I$(src)/support

ccflags-$(CONFIG_XFS_DEBUG) += -g



XFS_LINUX := linux-2.6



obj-$(CONFIG_XFS_FS)		+= xfs.o



xfs-y				+= linux-2.6/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

# this one should be compiled first, as the tracing macros can easily blow up

xfs-y				+= xfs_trace.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 +68,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_rename.o \

				   xfs_trans.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/

xfs-y				+= support/uuid.o
 
# optional features

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

fs/xfs/linux-2.6/kmem.c→fs/xfs/kmem.c

+0 −0

File moved.

View file

fs/xfs/linux-2.6/kmem.h→fs/xfs/kmem.h

+0 −0

File moved.

View file

fs/xfs/linux-2.6/mrlock.h→fs/xfs/mrlock.h

+0 −0

File moved.

View file

fs/xfs/linux-2.6/time.h→fs/xfs/time.h

+0 −0

File moved.

View file