From 408cec5086eecde903cfc6d63cb60e50dbd2a0ac Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Thu, 20 Jun 2019 01:46:21 +0200
Subject: [PATCH] btrfs-progs: move string-table.[ch] to common/

Signed-off-by: David Sterba <dsterba@suse.com>
---
 Android.mk                              | 2 +-
 Makefile                                | 2 +-
 cmds/filesystem-usage.c                 | 2 +-
 string-table.c => common/string-table.c | 2 +-
 string-table.h => common/string-table.h | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename string-table.c => common/string-table.c (99%)
 rename string-table.h => common/string-table.h (100%)

diff --git a/Android.mk b/Android.mk
index e14613a9..e8de47eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,7 @@ objects := ctree.c disk-io.c kernel-lib/radix-tree.c extent-tree.c print-tree.c
           root-tree.c dir-item.c file-item.c inode-item.c inode-map.c \
           extent-cache.c extent_io.c volumes.c utils.c repair.c \
           qgroup.c free-space-cache.c kernel-lib/list_sort.c props.c \
-          kernel-shared/ulist.c qgroup-verify.c backref.c string-table.c task-utils.c \
+          kernel-shared/ulist.c qgroup-verify.c backref.c common/string-table.c task-utils.c \
           inode.c file.c find-root.c free-space-tree.c help.c send-dump.c \
           common/fsfeatures.c kernel-lib/tables.c kernel-lib/raid56.c transaction.c
 cmds_objects := cmds-subvolume.c cmds-filesystem.c cmds-device.c cmds-scrub.c \
diff --git a/Makefile b/Makefile
index 46face4e..97c36473 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,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 free-space-cache.o kernel-lib/list_sort.o props.o \
-	  kernel-shared/ulist.o qgroup-verify.o backref.o string-table.o \
+	  kernel-shared/ulist.o qgroup-verify.o backref.o common/string-table.o \
 	  common/task-utils.o \
 	  inode.o file.o find-root.o free-space-tree.o common/help.o send-dump.o \
 	  common/fsfeatures.o kernel-lib/tables.o kernel-lib/raid56.o transaction.o \
diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c
index b677e130..b2bf92a7 100644
--- a/cmds/filesystem-usage.c
+++ b/cmds/filesystem-usage.c
@@ -27,7 +27,7 @@
 #include "utils.h"
 #include "kerncompat.h"
 #include "ctree.h"
-#include "string-table.h"
+#include "common/string-table.h"
 #include "cmds/filesystem-usage.h"
 #include "cmds/commands.h"
 #include "disk-io.h"
diff --git a/string-table.c b/common/string-table.c
similarity index 99%
rename from string-table.c
rename to common/string-table.c
index 45528570..02e44b8d 100644
--- a/string-table.c
+++ b/common/string-table.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "string-table.h"
+#include "common/string-table.h"
 
 /*
  *  This function create an array of char * which will represent a table
diff --git a/string-table.h b/common/string-table.h
similarity index 100%
rename from string-table.h
rename to common/string-table.h