Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (35a177a0) · Commits · e / devices / android_kernel_sony_msm8994

fs/xfs/Makefile

+58 −61

Original line number	Original line	Diff line number	Diff line
	@@ -16,44 +16,53 @@
	# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA		# 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		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-y += xfs_alloc.o \
	xfs_alloc_btree.o \		xfs_alloc_btree.o \
	xfs_attr.o \		xfs_attr.o \
	xfs_attr_leaf.o \		xfs_attr_leaf.o \
	xfs_bit.o \
	xfs_bmap.o \		xfs_bmap.o \
	xfs_bmap_btree.o \		xfs_bmap_btree.o \
	xfs_btree.o \		xfs_btree.o \
	xfs_buf_item.o \
	xfs_da_btree.o \		xfs_da_btree.o \
	xfs_dir2.o \		xfs_dir2.o \
	xfs_dir2_block.o \		xfs_dir2_block.o \
	@@ -61,49 +70,37 @@ xfs-y += xfs_alloc.o \
	xfs_dir2_leaf.o \		xfs_dir2_leaf.o \
	xfs_dir2_node.o \		xfs_dir2_node.o \
	xfs_dir2_sf.o \		xfs_dir2_sf.o \
	xfs_error.o \
	xfs_extfree_item.o \
	xfs_filestream.o \
	xfs_fsops.o \
	xfs_ialloc.o \		xfs_ialloc.o \
	xfs_ialloc_btree.o \		xfs_ialloc_btree.o \
	xfs_iget.o \
	xfs_inode.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_log_recover.o \
	xfs_mount.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_ail.o \
	xfs_trans_buf.o \		xfs_trans_buf.o \
	xfs_trans_extfree.o \		xfs_trans_extfree.o \
	xfs_trans_inode.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

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