From e70dc52ff2ee0bdf9d35cb1fa37611b92ecb1338 Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Wed, 20 Jul 2022 01:00:06 +0000
Subject: [PATCH] blobfs: rename tree.h to cache_tree.h

Avoids conflict with public tree.h that can cause
problems with abidiff.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I3ccf4c0198f7975d8ebbee57f50c52f9f2e96fc0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13730
Community-CI: Mellanox Build Bot
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 lib/blobfs/blobfs.c                 | 2 +-
 lib/blobfs/{tree.h => cache_tree.h} | 0
 lib/blobfs/tree.c                   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/blobfs/{tree.h => cache_tree.h} (100%)

diff --git a/lib/blobfs/blobfs.c b/lib/blobfs/blobfs.c
index e2c36bd5c..ab221f726 100644
--- a/lib/blobfs/blobfs.c
+++ b/lib/blobfs/blobfs.c
@@ -6,7 +6,7 @@
 #include "spdk/stdinc.h"
 
 #include "spdk/blobfs.h"
-#include "tree.h"
+#include "cache_tree.h"
 
 #include "spdk/queue.h"
 #include "spdk/thread.h"
diff --git a/lib/blobfs/tree.h b/lib/blobfs/cache_tree.h
similarity index 100%
rename from lib/blobfs/tree.h
rename to lib/blobfs/cache_tree.h
diff --git a/lib/blobfs/tree.c b/lib/blobfs/tree.c
index 71f082720..23168f9ef 100644
--- a/lib/blobfs/tree.c
+++ b/lib/blobfs/tree.c
@@ -6,7 +6,7 @@
 #include "spdk/stdinc.h"
 
 #include "spdk/blobfs.h"
-#include "tree.h"
+#include "cache_tree.h"
 
 #include "spdk/queue.h"
 #include "spdk/assert.h"