diff options
| -rw-r--r-- | Makefile.in | 14 | ||||
| -rw-r--r-- | kernel-lib/crc32c.c (renamed from crc32c.c) | 0 | ||||
| -rw-r--r-- | kernel-lib/crc32c.h (renamed from crc32c.h) | 0 | ||||
| -rw-r--r-- | kernel-lib/interval_tree_generic.h (renamed from interval_tree_generic.h) | 0 | ||||
| -rw-r--r-- | kernel-lib/list.h (renamed from list.h) | 0 | ||||
| -rw-r--r-- | kernel-lib/list_sort.c (renamed from list_sort.c) | 0 | ||||
| -rw-r--r-- | kernel-lib/list_sort.h (renamed from list_sort.h) | 0 | ||||
| -rw-r--r-- | kernel-lib/radix-tree.c (renamed from radix-tree.c) | 0 | ||||
| -rw-r--r-- | kernel-lib/radix-tree.h (renamed from radix-tree.h) | 0 | ||||
| -rw-r--r-- | kernel-lib/rbtree.c (renamed from rbtree.c) | 0 | ||||
| -rw-r--r-- | kernel-lib/rbtree.h (renamed from rbtree.h) | 0 | ||||
| -rw-r--r-- | kernel-lib/rbtree_augmented.h (renamed from rbtree_augmented.h) | 0 |
12 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 7202cdb5..20b740a0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,6 +61,7 @@ CFLAGS = @CFLAGS@ \ -fno-strict-aliasing \ -fPIC \ -I$(TOPDIR) \ + -I$(TOPDIR)/kernel-lib \ $(EXTRAWARN_CFLAGS) \ $(DEBUG_CFLAGS_INTERNAL) \ $(EXTRA_CFLAGS) @@ -86,10 +87,10 @@ CHECKER_FLAGS := -include $(check_defs) -D__CHECKER__ \ -D__CHECK_ENDIAN__ -Wbitwise -Wuninitialized -Wshadow -Wundef \ -U_FORTIFY_SOURCE -objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \ +objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \ root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \ extent-cache.o extent_io.o volumes.o utils.o repair.o \ - qgroup.o raid6.o free-space-cache.o list_sort.o props.o \ + qgroup.o raid6.o free-space-cache.o kernel-lib/list_sort.o props.o \ ulist.o qgroup-verify.o backref.o string-table.o task-utils.o \ inode.o file.o find-root.o free-space-tree.o help.o cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ @@ -98,10 +99,12 @@ cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \ cmds-property.o cmds-fi-usage.o cmds-inspect-dump-tree.o \ cmds-inspect-dump-super.o cmds-inspect-tree-stats.o cmds-fi-du.o -libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \ +libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \ + kernel-lib/crc32c.o \ uuid-tree.o utils-lib.o rbtree-utils.o -libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \ - crc32c.h list.h kerncompat.h radix-tree.h extent-cache.h \ +libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \ + kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \ + kernel-lib/radix-tree.h extent-cache.h \ extent_io.h ioctl.h ctree.h btrfsck.h version.h TESTS = fsck-tests.sh convert-tests.sh @@ -422,6 +425,7 @@ clean-all: clean clean-doc clean-gen clean: $(CLEANDIRS) @echo "Cleaning" $(Q)$(RM) -f $(progs) cscope.out *.o *.o.d \ + kernel-lib/*.o kernel-lib/*.o.d \ dir-test ioctl-test quick-test send-test library-test library-test-static \ btrfs.static mkfs.btrfs.static \ $(check_defs) \ diff --git a/crc32c.c b/kernel-lib/crc32c.c index dfa4e6c1..dfa4e6c1 100644 --- a/crc32c.c +++ b/kernel-lib/crc32c.c diff --git a/crc32c.h b/kernel-lib/crc32c.h index c552ef6e..c552ef6e 100644 --- a/crc32c.h +++ b/kernel-lib/crc32c.h diff --git a/interval_tree_generic.h b/kernel-lib/interval_tree_generic.h index e26c7322..e26c7322 100644 --- a/interval_tree_generic.h +++ b/kernel-lib/interval_tree_generic.h diff --git a/list.h b/kernel-lib/list.h index db7a58c7..db7a58c7 100644 --- a/list.h +++ b/kernel-lib/list.h diff --git a/list_sort.c b/kernel-lib/list_sort.c index 9e2c2024..9e2c2024 100644 --- a/list_sort.c +++ b/kernel-lib/list_sort.c diff --git a/list_sort.h b/kernel-lib/list_sort.h index 987cd5c4..987cd5c4 100644 --- a/list_sort.h +++ b/kernel-lib/list_sort.h diff --git a/radix-tree.c b/kernel-lib/radix-tree.c index f259ab56..f259ab56 100644 --- a/radix-tree.c +++ b/kernel-lib/radix-tree.c diff --git a/radix-tree.h b/kernel-lib/radix-tree.h index bf96d839..bf96d839 100644 --- a/radix-tree.h +++ b/kernel-lib/radix-tree.h diff --git a/rbtree.c b/kernel-lib/rbtree.c index 92590a57..92590a57 100644 --- a/rbtree.c +++ b/kernel-lib/rbtree.c diff --git a/rbtree.h b/kernel-lib/rbtree.h index 47b662a3..47b662a3 100644 --- a/rbtree.h +++ b/kernel-lib/rbtree.h diff --git a/rbtree_augmented.h b/kernel-lib/rbtree_augmented.h index 5d269784..5d269784 100644 --- a/rbtree_augmented.h +++ b/kernel-lib/rbtree_augmented.h |