From d1efe50d0a64e757fac0775858ea92e1266ce16d Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Thu, 20 Jun 2019 00:44:36 +0200
Subject: [PATCH] btrfs-progs: move messages.[ch] to common/

Signed-off-by: David Sterba <dsterba@suse.com>
---
 Makefile                        | 2 +-
 check/mode-common.c             | 2 +-
 check/mode-lowmem.c             | 2 +-
 messages.c => common/messages.c | 2 +-
 messages.h => common/messages.h | 0
 ctree.c                         | 2 +-
 image/sanitize.c                | 2 +-
 inode.c                         | 2 +-
 mkfs/rootdir.c                  | 2 +-
 transaction.c                   | 2 +-
 utils.h                         | 2 +-
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename messages.c => common/messages.c (98%)
 rename messages.h => common/messages.h (100%)

diff --git a/Makefile b/Makefile
index 63d337cc..4fb99599 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \
 	       cmds/inspect-dump-super.o cmds/inspect-tree-stats.o cmds/filesystem-du.o \
 	       mkfs/common.o check/mode-common.o check/mode-lowmem.o
 libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
-		   kernel-lib/crc32c.o messages.o \
+		   kernel-lib/crc32c.o common/messages.o \
 		   uuid-tree.o utils-lib.o rbtree-utils.o
 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 \
diff --git a/check/mode-common.c b/check/mode-common.c
index 657859c3..b9150408 100644
--- a/check/mode-common.c
+++ b/check/mode-common.c
@@ -17,7 +17,7 @@
 #include <time.h>
 #include "ctree.h"
 #include "common/internal.h"
-#include "messages.h"
+#include "common/messages.h"
 #include "transaction.h"
 #include "utils.h"
 #include "disk-io.h"
diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c
index 317651c6..4959f401 100644
--- a/check/mode-lowmem.c
+++ b/check/mode-lowmem.c
@@ -18,7 +18,7 @@
 #include "ctree.h"
 #include "repair.h"
 #include "transaction.h"
-#include "messages.h"
+#include "common/messages.h"
 #include "disk-io.h"
 #include "backref.h"
 #include "hash.h"
diff --git a/messages.c b/common/messages.c
similarity index 98%
rename from messages.c
rename to common/messages.c
index 7600091f..0e5694ec 100644
--- a/messages.c
+++ b/common/messages.c
@@ -16,7 +16,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include "messages.h"
+#include "common/messages.h"
 
 __attribute__ ((format (printf, 1, 2)))
 void __btrfs_warning(const char *fmt, ...)
diff --git a/messages.h b/common/messages.h
similarity index 100%
rename from messages.h
rename to common/messages.h
diff --git a/ctree.c b/ctree.c
index 25de2ce9..4ad4ec8a 100644
--- a/ctree.c
+++ b/ctree.c
@@ -22,7 +22,7 @@
 #include "repair.h"
 #include "common/internal.h"
 #include "sizes.h"
-#include "messages.h"
+#include "common/messages.h"
 #include "volumes.h"
 
 static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root
diff --git a/image/sanitize.c b/image/sanitize.c
index f6d12bad..1817fb72 100644
--- a/image/sanitize.c
+++ b/image/sanitize.c
@@ -16,7 +16,7 @@
 
 #include "kerncompat.h"
 #include "common/internal.h"
-#include "messages.h"
+#include "common/messages.h"
 #include "utils.h"
 #include "kernel-lib/crc32c.h"
 #include "image/sanitize.h"
diff --git a/inode.c b/inode.c
index 2398bca4..dbf235e8 100644
--- a/inode.c
+++ b/inode.c
@@ -28,7 +28,7 @@
 #include "transaction.h"
 #include "disk-io.h"
 #include "time.h"
-#include "messages.h"
+#include "common/messages.h"
 
 /*
  * Find a free inode index for later btrfs_add_link().
diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
index ba5824f3..bb8090eb 100644
--- a/mkfs/rootdir.c
+++ b/mkfs/rootdir.c
@@ -29,7 +29,7 @@
 #include "volumes.h"
 #include "common/internal.h"
 #include "disk-io.h"
-#include "messages.h"
+#include "common/messages.h"
 #include "transaction.h"
 #include "utils.h"
 #include "mkfs/rootdir.h"
diff --git a/transaction.c b/transaction.c
index fe1f76ae..551fb24e 100644
--- a/transaction.c
+++ b/transaction.c
@@ -19,7 +19,7 @@
 #include "transaction.h"
 #include "delayed-ref.h"
 
-#include "messages.h"
+#include "common/messages.h"
 
 struct btrfs_trans_handle* btrfs_start_transaction(struct btrfs_root *root,
 		int num_blocks)
diff --git a/utils.h b/utils.h
index 4aea6135..9cbdd4d7 100644
--- a/utils.h
+++ b/utils.h
@@ -27,7 +27,7 @@
 #include "common/internal.h"
 #include "btrfs-list.h"
 #include "sizes.h"
-#include "messages.h"
+#include "common/messages.h"
 #include "ioctl.h"
 #include "fsfeatures.h"