ext4: check s_chksum_driver when looking for bg csum presence

[firefly-linux-kernel-4.4.55.git] / fs / xfs / Makefile

diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index c21f4350666112c4222b33ad7c268e1d759d540c..d61799949580a497ccae45883cb2f4c3f8e34495 100644 (file)
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -17,6 +17,7 @@
 #
 
 ccflags-y += -I$(src)                  # needed for trace events
+ccflags-y += -I$(src)/libxfs
 
 ccflags-$(CONFIG_XFS_DEBUG) += -g
 
@@ -25,6 +26,39 @@ obj-$(CONFIG_XFS_FS)         += xfs.o
 # this one should be compiled first, as the tracing macros can easily blow up
 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
 xfs-y                          += xfs_aops.o \
                                   xfs_attr_inactive.o \
@@ -45,53 +79,27 @@ 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 \
                                   xfs_mru_cache.o \
                                   xfs_super.o \
                                   xfs_symlink.o \
+                                  xfs_sysfs.o \
                                   xfs_trans.o \
                                   xfs_xattr.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_sb.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 \
@@ -107,8 +115,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