diff --git a/src/common/src/tmount.c b/src/common/src/tmount.c index abc01d9dfa..420fdd76de 100644 --- a/src/common/src/tmount.c +++ b/src/common/src/tmount.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ #include "os.h" -#include "tdisk.h" +#include "tmount.h" #include "hash.h" #include "taosdef.h" #include "taoserror.h" @@ -26,18 +26,18 @@ typedef struct { uint64_t nfiles; } SDiskMeta; -typedef struct { - uint64_t tsize; - uint64_t avail; // bytes -} STiersMeta; - typedef struct { int level; - int did; + int id; char dir[TSDB_FILENAME_LEN]; SDiskMeta dmeta; } SDisk; +typedef struct { + uint64_t tsize; + uint64_t avail; // bytes +} STiersMeta; + typedef struct { int level; int nDisks; diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c index d96b0fe25c..63e71cbb31 100644 --- a/src/dnode/src/dnodeMain.c +++ b/src/dnode/src/dnodeMain.c @@ -38,7 +38,7 @@ #include "dnodeShell.h" #include "dnodeTelemetry.h" #include "tpath.h" -#include "tdisk.h" +#include "tmount.h" static SRunStatus tsRunStatus = TSDB_RUN_STATUS_STOPPED; diff --git a/src/os/src/detail/osSysinfo.c b/src/os/src/detail/osSysinfo.c index 7baa58bfcd..e54b8763dd 100644 --- a/src/os/src/detail/osSysinfo.c +++ b/src/os/src/detail/osSysinfo.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "os.h" #include "tconfig.h" -#include "tdisk.h" +#include "tmount.h" #include "tglobal.h" #include "tulog.h" diff --git a/src/plugins/monitor/src/monitorMain.c b/src/plugins/monitor/src/monitorMain.c index e39e038807..8cbc7a1ee6 100644 --- a/src/plugins/monitor/src/monitorMain.c +++ b/src/plugins/monitor/src/monitorMain.c @@ -20,7 +20,7 @@ #include "tlog.h" #include "ttimer.h" #include "tutil.h" -#include "tdisk.h" +#include "tmount.h" #include "tscUtil.h" #include "tsclient.h" #include "dnode.h" diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h index ef9222c59e..cb21108e9d 100644 --- a/src/tsdb/inc/tsdbMain.h +++ b/src/tsdb/inc/tsdbMain.h @@ -26,7 +26,7 @@ #include "tsdb.h" #include "tskiplist.h" #include "tutil.h" -#include "tdisk.h" +#include "tmount.h" #ifdef __cplusplus extern "C" { diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c index 1bfa09fc11..d113d9aa5f 100644 --- a/src/tsdb/src/tsdbFile.c +++ b/src/tsdb/src/tsdbFile.c @@ -22,7 +22,7 @@ #include "tsdbMain.h" #include "tutil.h" #include "tpath.h" -#include "tdisk.h" +#include "tmount.h" const char * tsdbFileSuffix[] = {".head", ".data", ".last", ".stat", ".h", ".d", ".l", ".s"}; diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c index 357a067947..4b3005f196 100644 --- a/src/vnode/src/vnodeMain.c +++ b/src/vnode/src/vnodeMain.c @@ -30,7 +30,7 @@ #include "dnodeVRead.h" #include "query.h" #include "tpath.h" -#include "tdisk.h" +#include "tmount.h" static SHashObj*tsVnodesHash; static void vnodeCleanUp(SVnodeObj *pVnode);