diff --git a/source/libs/tfs/inc/tfsint.h b/source/libs/tfs/inc/tfsint1.h
similarity index 98%
rename from source/libs/tfs/inc/tfsint.h
rename to source/libs/tfs/inc/tfsint1.h
index 3c5dccc63b..caa52b5cd6 100644
--- a/source/libs/tfs/inc/tfsint.h
+++ b/source/libs/tfs/inc/tfsint1.h
@@ -16,6 +16,9 @@
 #ifndef TD_TFSINT_H
 #define TD_TFSINT_H
 
+#include "os.h"
+
+#include "taoserror.h"
 #include "tlog.h"
 #include "tglobal.h"
 #include "tfs.h"
diff --git a/source/libs/tfs/src/tdisk.c b/source/libs/tfs/src/tfsDisk.c
similarity index 79%
rename from source/libs/tfs/src/tdisk.c
rename to source/libs/tfs/src/tfsDisk.c
index 22601e48c3..f32069837d 100644
--- a/source/libs/tfs/src/tdisk.c
+++ b/source/libs/tfs/src/tfsDisk.c
@@ -12,14 +12,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-#include "os.h"
 
-#include "taoserror.h"
+#define _DEFAULT_SOURCE
 #include "tfsint.h"
 
-// PROTECTED ====================================
-SDisk *tfsNewDisk(int level, int id, const char *dir) {
-  SDisk *pDisk = (SDisk *)calloc(1, sizeof(*pDisk));
+SDisk *tfsNewDisk(int32_t level, int32_t id, const char *dir) {
+  SDisk *pDisk = calloc(1, sizeof(SDisk));
   if (pDisk == NULL) {
     terrno = TSDB_CODE_FS_OUT_OF_MEMORY;
     return NULL;
@@ -33,18 +31,21 @@ SDisk *tfsNewDisk(int level, int id, const char *dir) {
 }
 
 SDisk *tfsFreeDisk(SDisk *pDisk) {
-  if (pDisk) {
+  if (pDisk != NULL) {
     free(pDisk);
   }
   return NULL;
 }
 
-int tfsUpdateDiskInfo(SDisk *pDisk) {
-  ASSERT(pDisk != NULL);
+int32_t tfsUpdateDiskInfo(SDisk *pDisk) {
+  if (pDisk == NULL) {
+    terrno = TSDB_CODE_INVALID_PARA;
+    return -1;
+  }
 
   SysDiskSize diskSize = {0};
 
-  int code = taosGetDiskSize(pDisk->dir, &diskSize);
+  int32_t code = taosGetDiskSize(pDisk->dir, &diskSize);
   if (code != 0) {
     fError("failed to update disk information at level %d id %d dir %s since %s", pDisk->level, pDisk->id, pDisk->dir,
            strerror(errno));
diff --git a/source/libs/tfs/src/ttier.c b/source/libs/tfs/src/tfsTier.c
similarity index 100%
rename from source/libs/tfs/src/ttier.c
rename to source/libs/tfs/src/tfsTier.c
diff --git a/src/inc/tfs.h b/src/inc/tfs.h
deleted file mode 100644
index 9ad7a8f66e..0000000000
--- a/src/inc/tfs.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TD_TFS_H
-#define TD_TFS_H
-
-#include "tglobal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-  int level;
-  int id;
-} SDiskID;
-
-#define TFS_UNDECIDED_LEVEL -1
-#define TFS_UNDECIDED_ID -1
-#define TFS_PRIMARY_LEVEL 0
-#define TFS_PRIMARY_ID 0
-#define TFS_MIN_LEVEL 0
-#define TFS_MAX_LEVEL (TSDB_MAX_TIERS - 1)
-
-// FS APIs ====================================
-typedef struct {
-  int64_t tsize;
-  int64_t used;
-  int64_t avail;
-} SFSMeta;
-
-typedef struct {
-  int64_t size;
-  int64_t used;
-  int64_t free;
-  int16_t nAvailDisks;  // # of Available disks
-} STierMeta;
-
-int  tfsInit(SDiskCfg *pDiskCfg, int ndisk);
-void tfsCleanup();
-void tfsUpdateInfo(SFSMeta *pFSMeta, STierMeta *tierMetas, int8_t numLevels);
-void tfsGetMeta(SFSMeta *pMeta);
-void tfsAllocDisk(int expLevel, int *level, int *id);
-
-const char *TFS_PRIMARY_PATH();
-const char *TFS_DISK_PATH(int level, int id);
-
-// TFILE APIs ====================================
-typedef struct {
-  int  level;
-  int  id;
-  char rname[TSDB_FILENAME_LEN];  // REL name
-  char aname[TSDB_FILENAME_LEN];  // ABS name
-} TFILE;
-
-#define TFILE_LEVEL(pf) ((pf)->level)
-#define TFILE_ID(pf) ((pf)->id)
-#define TFILE_NAME(pf) ((pf)->aname)
-#define TFILE_REL_NAME(pf) ((pf)->rname)
-
-#define tfsopen(pf, flags) open(TFILE_NAME(pf), flags)
-#define tfsclose(fd) close(fd)
-#define tfsremove(pf) remove(TFILE_NAME(pf))
-#define tfscopy(sf, df) taosCopy(TFILE_NAME(sf), TFILE_NAME(df))
-#define tfsrename(sf, df) taosRename(TFILE_NAME(sf), TFILE_NAME(df))
-
-void  tfsInitFile(TFILE *pf, int level, int id, const char *bname);
-bool  tfsIsSameFile(const TFILE *pf1, const TFILE *pf2);
-int   tfsEncodeFile(void **buf, TFILE *pf);
-void *tfsDecodeFile(void *buf, TFILE *pf);
-void  tfsbasename(const TFILE *pf, char *dest);
-void  tfsdirname(const TFILE *pf, char *dest);
-
-// DIR APIs ====================================
-int tfsMkdirAt(const char *rname, int level, int id);
-int tfsMkdirRecurAt(const char *rname, int level, int id);
-int tfsMkdir(const char *rname);
-int tfsRmdir(const char *rname);
-int tfsRename(char *orname, char *nrname);
-
-typedef struct TDIR TDIR;
-
-TDIR *       tfsOpendir(const char *rname);
-const TFILE *tfsReaddir(TDIR *tdir);
-void         tfsClosedir(TDIR *tdir);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif