1 files changed, 8 insertions, 10 deletions
diff --git a/util/nvmutil/include/common.h b/util/nvmutil/include/common.h
index 6cdeba18..cec06b25 100644
--- a/util/nvmutil/include/common.h
+++ b/util/nvmutil/include/common.h
@@ -306,12 +306,6 @@ struct xstate {
 	int cat;
 };
 
-struct path_split {
-	int dirfd;
-	char *buf;
-	const char *base;
-};
-
 struct xstate *xstart(int argc, char *argv[]);
 struct xstate *xstatus(void);
 
@@ -505,15 +499,19 @@ int same_dir(const char *a, const char *b);
 int tmpdir_policy(const char *path,
     int *allow_noworld_unsticky);
 char *env_tmpdir(int always_sticky);
-int split_path(const char *path,
-    struct path_split *ps);
-int open_verified_dir(const char *path);
-int check_dirfd(int dirfd, const char *path);
 int secure_file(int *fd, struct stat *st,
     int bad_flags, int check_seek,
     int do_lock, mode_t mode);
 int close_on_eintr(int fd);
 int fsync_on_eintr(int fd);
+int fs_resolve(const char *path, int flags);
+int fs_root_fd(void);
+int fs_next_component(const char **p,
+    char *name, size_t namesz);
+int fs_open_component(int dirfd, const char *name,
+    int flags, int is_last);
+int fs_dirname_basename(const char *path,
+    char **dir, char **base, int allow_relative);
 
 /* asserts */