From 886a8565e03bfacddc1383fe61439303226a8802 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 9 Feb 2017 16:13:14 +0100 Subject: [PATCH] btrfs-progs: move ulist.[ch] to kernel-shared The implementation of ulist_* is same for kernel and userspace, without dependencies, so we can keep it separately for code sync. Signed-off-by: David Sterba --- Makefile | 2 +- backref.c | 2 +- backref.h | 2 +- cmds-check.c | 2 +- ulist.c => kernel-shared/ulist.c | 0 ulist.h => kernel-shared/ulist.h | 0 qgroup-verify.c | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename ulist.c => kernel-shared/ulist.c (100%) rename ulist.h => kernel-shared/ulist.h (100%) diff --git a/Makefile b/Makefile index 5a30fbd5..2b8e929f 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ 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 raid56.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 \ + kernel-shared/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 send-dump.o \ fsfeatures.o messages.o cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ diff --git a/backref.c b/backref.c index a43e80da..e1f41e1a 100644 --- a/backref.c +++ b/backref.c @@ -20,7 +20,7 @@ #include "ctree.h" #include "disk-io.h" #include "backref.h" -#include "ulist.h" +#include "kernel-shared/ulist.h" #include "transaction.h" #include "internal.h" diff --git a/backref.h b/backref.h index 3d2ed458..b68c5047 100644 --- a/backref.h +++ b/backref.h @@ -19,7 +19,7 @@ #ifndef __BTRFS_BACKREF_H__ #define __BTRFS_BACKREF_H__ -#include "ulist.h" +#include "kernel-shared/ulist.h" #include "extent_io.h" struct inode_fs_paths { diff --git a/cmds-check.c b/cmds-check.c index 7a1563b4..d7fcf9da 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -40,7 +40,7 @@ #include "qgroup-verify.h" #include "rbtree-utils.h" #include "backref.h" -#include "ulist.h" +#include "kernel-shared/ulist.h" #include "hash.h" #include "help.h" diff --git a/ulist.c b/kernel-shared/ulist.c similarity index 100% rename from ulist.c rename to kernel-shared/ulist.c diff --git a/ulist.h b/kernel-shared/ulist.h similarity index 100% rename from ulist.h rename to kernel-shared/ulist.h diff --git a/qgroup-verify.c b/qgroup-verify.c index ff46bc4c..23d34699 100644 --- a/qgroup-verify.c +++ b/qgroup-verify.c @@ -27,7 +27,7 @@ #include "disk-io.h" #include "print-tree.h" #include "utils.h" -#include "ulist.h" +#include "kernel-shared/ulist.h" #include "rbtree-utils.h" #include "transaction.h" #include "repair.h"