LU-4293 utils: handle lfs migrate failure in lfs_migrate

[fs/lustre-release.git] / lustre / include / lvfs.h

diff --git a/lustre/include/lvfs.h b/lustre/include/lvfs.h
index fb02ac9..7f16cfc 100644 (file)
--- a/lustre/include/lvfs.h
+++ b/lustre/include/lvfs.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,25 +52,15 @@
 #error Unsupported operating system.
 #endif
 
-#include <lustre_ucache.h>
-
+#include <libcfs/lucache.h>
 
 #ifdef LIBLUSTRE
 #include <lvfs_user_fs.h>
 #endif
 
-/* lvfs_common.c */
-struct dentry *lvfs_fid2dentry(struct lvfs_run_ctxt *, __u64, __u32, __u64 ,void *data);
-
+/* lvfs_linux.c */
 void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx,
                struct lvfs_ucred *cred);
 void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx,
               struct lvfs_ucred *cred);
-
-
-static inline int ll_fid2str(char *str, __u64 id, __u32 generation)
-{
-        return sprintf(str, "%llx:%08x", (unsigned long long)id, generation);
-}
-
 #endif