From 30f712c9dd69348aa51351d5cb6d366bf4fae31d Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Wed, 25 Jun 2014 14:57:53 +1000 Subject: [PATCH] libxfs: move source files Move all the source files that are shared with userspace into libxfs/. This is done as one big chunk simpy to get it done quickly Signed-off-by: Dave Chinner Reviewed-by: Brian Foster Signed-off-by: Dave Chinner --- fs/xfs/Makefile | 63 ++++++++++++++++---------------- fs/xfs/{ => libxfs}/xfs_alloc.c | 0 fs/xfs/{ => libxfs}/xfs_alloc_btree.c | 0 fs/xfs/{ => libxfs}/xfs_attr.c | 0 fs/xfs/{ => libxfs}/xfs_attr_leaf.c | 0 fs/xfs/{ => libxfs}/xfs_attr_remote.c | 0 fs/xfs/{ => libxfs}/xfs_bmap.c | 0 fs/xfs/{ => libxfs}/xfs_bmap_btree.c | 0 fs/xfs/{ => libxfs}/xfs_btree.c | 0 fs/xfs/{ => libxfs}/xfs_da_btree.c | 0 fs/xfs/{ => libxfs}/xfs_da_format.c | 0 fs/xfs/{ => libxfs}/xfs_dir2.c | 0 fs/xfs/{ => libxfs}/xfs_dir2_block.c | 0 fs/xfs/{ => libxfs}/xfs_dir2_data.c | 0 fs/xfs/{ => libxfs}/xfs_dir2_leaf.c | 0 fs/xfs/{ => libxfs}/xfs_dir2_node.c | 0 fs/xfs/{ => libxfs}/xfs_dir2_priv.h | 0 fs/xfs/{ => libxfs}/xfs_dir2_sf.c | 0 fs/xfs/{ => libxfs}/xfs_dquot_buf.c | 0 fs/xfs/{ => libxfs}/xfs_ialloc.c | 0 fs/xfs/{ => libxfs}/xfs_ialloc_btree.c | 0 fs/xfs/{ => libxfs}/xfs_inode_buf.c | 0 fs/xfs/{ => libxfs}/xfs_inode_fork.c | 0 fs/xfs/{ => libxfs}/xfs_log_rlimit.c | 0 fs/xfs/{ => libxfs}/xfs_rtbitmap.c | 0 fs/xfs/{ => libxfs}/xfs_symlink_remote.c | 0 fs/xfs/{ => libxfs}/xfs_trans_resv.c | 0 27 files changed, 32 insertions(+), 31 deletions(-) rename fs/xfs/{ => libxfs}/xfs_alloc.c (100%) rename fs/xfs/{ => libxfs}/xfs_alloc_btree.c (100%) rename fs/xfs/{ => libxfs}/xfs_attr.c (100%) rename fs/xfs/{ => libxfs}/xfs_attr_leaf.c (100%) rename fs/xfs/{ => libxfs}/xfs_attr_remote.c (100%) rename fs/xfs/{ => libxfs}/xfs_bmap.c (100%) rename fs/xfs/{ => libxfs}/xfs_bmap_btree.c (100%) rename fs/xfs/{ => libxfs}/xfs_btree.c (100%) rename fs/xfs/{ => libxfs}/xfs_da_btree.c (100%) rename fs/xfs/{ => libxfs}/xfs_da_format.c (100%) rename fs/xfs/{ => libxfs}/xfs_dir2.c (100%) rename fs/xfs/{ => libxfs}/xfs_dir2_block.c (100%) rename fs/xfs/{ => libxfs}/xfs_dir2_data.c (100%) rename fs/xfs/{ => libxfs}/xfs_dir2_leaf.c (100%) rename fs/xfs/{ => libxfs}/xfs_dir2_node.c (100%) rename fs/xfs/{ => libxfs}/xfs_dir2_priv.h (100%) rename fs/xfs/{ => libxfs}/xfs_dir2_sf.c (100%) rename fs/xfs/{ => libxfs}/xfs_dquot_buf.c (100%) rename fs/xfs/{ => libxfs}/xfs_ialloc.c (100%) rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.c (100%) rename fs/xfs/{ => libxfs}/xfs_inode_buf.c (100%) rename fs/xfs/{ => libxfs}/xfs_inode_fork.c (100%) rename fs/xfs/{ => libxfs}/xfs_log_rlimit.c (100%) rename fs/xfs/{ => libxfs}/xfs_rtbitmap.c (100%) rename fs/xfs/{ => libxfs}/xfs_symlink_remote.c (100%) rename fs/xfs/{ => libxfs}/xfs_trans_resv.c (100%) diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index 4c5edf0df9a3..0dfa26d626f5 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile @@ -28,7 +28,35 @@ xfs-y += xfs_trace.o # build the libxfs code first xfs-y += $(addprefix libxfs/, \ + xfs_alloc.o \ + xfs_alloc_btree.o \ + xfs_attr.o \ + xfs_attr_leaf.o \ + xfs_attr_remote.o \ + xfs_bmap.o \ + xfs_bmap_btree.o \ + xfs_btree.o \ + xfs_da_btree.o \ + xfs_da_format.o \ + xfs_dir2.o \ + xfs_dir2_block.o \ + xfs_dir2_data.o \ + xfs_dir2_leaf.o \ + xfs_dir2_node.o \ + xfs_dir2_sf.o \ + xfs_dquot_buf.o \ + xfs_ialloc.o \ + xfs_ialloc_btree.o \ + xfs_inode_fork.o \ + xfs_inode_buf.o \ + xfs_log_rlimit.o \ xfs_sb.o \ + xfs_symlink_remote.o \ + xfs_trans_resv.o \ + ) +# xfs_rtbitmap is shared with libxfs +xfs-$(CONFIG_XFS_RT) += $(addprefix libxfs/, \ + xfs_rtbitmap.o \ ) # highlevel code @@ -51,6 +79,7 @@ xfs-y += xfs_aops.o \ xfs_ioctl.o \ xfs_iomap.o \ xfs_iops.o \ + xfs_inode.o \ xfs_itable.o \ xfs_message.o \ xfs_mount.o \ @@ -62,41 +91,14 @@ xfs-y += xfs_aops.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_attr_remote.o \ - xfs_bmap.o \ - xfs_bmap_btree.o \ - xfs_btree.o \ - xfs_da_btree.o \ - xfs_da_format.o \ - xfs_dir2.o \ - xfs_dir2_block.o \ - xfs_dir2_data.o \ - xfs_dir2_leaf.o \ - xfs_dir2_node.o \ - xfs_dir2_sf.o \ - xfs_dquot_buf.o \ - xfs_ialloc.o \ - xfs_ialloc_btree.o \ - xfs_icreate_item.o \ - xfs_inode.o \ - xfs_inode_fork.o \ - xfs_inode_buf.o \ - xfs_log_recover.o \ - xfs_log_rlimit.o \ - xfs_symlink_remote.o \ - xfs_trans_resv.o - # low-level transaction/log code xfs-y += xfs_log.o \ xfs_log_cil.o \ xfs_buf_item.o \ xfs_extfree_item.o \ + xfs_icreate_item.o \ xfs_inode_item.o \ + xfs_log_recover.o \ xfs_trans_ail.o \ xfs_trans_buf.o \ xfs_trans_extfree.o \ @@ -112,8 +114,7 @@ xfs-$(CONFIG_XFS_QUOTA) += xfs_dquot.o \ xfs_quotaops.o # xfs_rtbitmap is shared with libxfs -xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o \ - xfs_rtbitmap.o +xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o xfs-$(CONFIG_PROC_FS) += xfs_stats.o diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c similarity index 100% rename from fs/xfs/xfs_alloc.c rename to fs/xfs/libxfs/xfs_alloc.c diff --git a/fs/xfs/xfs_alloc_btree.c b/fs/xfs/libxfs/xfs_alloc_btree.c similarity index 100% rename from fs/xfs/xfs_alloc_btree.c rename to fs/xfs/libxfs/xfs_alloc_btree.c diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c similarity index 100% rename from fs/xfs/xfs_attr.c rename to fs/xfs/libxfs/xfs_attr.c diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c similarity index 100% rename from fs/xfs/xfs_attr_leaf.c rename to fs/xfs/libxfs/xfs_attr_leaf.c diff --git a/fs/xfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c similarity index 100% rename from fs/xfs/xfs_attr_remote.c rename to fs/xfs/libxfs/xfs_attr_remote.c diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c similarity index 100% rename from fs/xfs/xfs_bmap.c rename to fs/xfs/libxfs/xfs_bmap.c diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c similarity index 100% rename from fs/xfs/xfs_bmap_btree.c rename to fs/xfs/libxfs/xfs_bmap_btree.c diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c similarity index 100% rename from fs/xfs/xfs_btree.c rename to fs/xfs/libxfs/xfs_btree.c diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c similarity index 100% rename from fs/xfs/xfs_da_btree.c rename to fs/xfs/libxfs/xfs_da_btree.c diff --git a/fs/xfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c similarity index 100% rename from fs/xfs/xfs_da_format.c rename to fs/xfs/libxfs/xfs_da_format.c diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c similarity index 100% rename from fs/xfs/xfs_dir2.c rename to fs/xfs/libxfs/xfs_dir2.c diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c similarity index 100% rename from fs/xfs/xfs_dir2_block.c rename to fs/xfs/libxfs/xfs_dir2_block.c diff --git a/fs/xfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c similarity index 100% rename from fs/xfs/xfs_dir2_data.c rename to fs/xfs/libxfs/xfs_dir2_data.c diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c similarity index 100% rename from fs/xfs/xfs_dir2_leaf.c rename to fs/xfs/libxfs/xfs_dir2_leaf.c diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c similarity index 100% rename from fs/xfs/xfs_dir2_node.c rename to fs/xfs/libxfs/xfs_dir2_node.c diff --git a/fs/xfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h similarity index 100% rename from fs/xfs/xfs_dir2_priv.h rename to fs/xfs/libxfs/xfs_dir2_priv.h diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c similarity index 100% rename from fs/xfs/xfs_dir2_sf.c rename to fs/xfs/libxfs/xfs_dir2_sf.c diff --git a/fs/xfs/xfs_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c similarity index 100% rename from fs/xfs/xfs_dquot_buf.c rename to fs/xfs/libxfs/xfs_dquot_buf.c diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c similarity index 100% rename from fs/xfs/xfs_ialloc.c rename to fs/xfs/libxfs/xfs_ialloc.c diff --git a/fs/xfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c similarity index 100% rename from fs/xfs/xfs_ialloc_btree.c rename to fs/xfs/libxfs/xfs_ialloc_btree.c diff --git a/fs/xfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c similarity index 100% rename from fs/xfs/xfs_inode_buf.c rename to fs/xfs/libxfs/xfs_inode_buf.c diff --git a/fs/xfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c similarity index 100% rename from fs/xfs/xfs_inode_fork.c rename to fs/xfs/libxfs/xfs_inode_fork.c diff --git a/fs/xfs/xfs_log_rlimit.c b/fs/xfs/libxfs/xfs_log_rlimit.c similarity index 100% rename from fs/xfs/xfs_log_rlimit.c rename to fs/xfs/libxfs/xfs_log_rlimit.c diff --git a/fs/xfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c similarity index 100% rename from fs/xfs/xfs_rtbitmap.c rename to fs/xfs/libxfs/xfs_rtbitmap.c diff --git a/fs/xfs/xfs_symlink_remote.c b/fs/xfs/libxfs/xfs_symlink_remote.c similarity index 100% rename from fs/xfs/xfs_symlink_remote.c rename to fs/xfs/libxfs/xfs_symlink_remote.c diff --git a/fs/xfs/xfs_trans_resv.c b/fs/xfs/libxfs/xfs_trans_resv.c similarity index 100% rename from fs/xfs/xfs_trans_resv.c rename to fs/xfs/libxfs/xfs_trans_resv.c -- 2.11.0