X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flvfs.h;h=8fff86303d63a1e500917543dd996ad2da1ba2b8;hb=295968fa7257978bba7aa4fedb28cd3563d4a5e0;hp=3a1172157cc8efdd0a78021e81f303c5352752e3;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git

diff --git a/lustre/include/lvfs.h b/lustre/include/lvfs.h
index 3a11721..8fff863 100644
--- 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.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -54,8 +52,7 @@
 #error Unsupported operating system.
 #endif
 
-#include <lustre_ucache.h>
-
+#include <libcfs/lucache.h>
 
 #ifdef LIBLUSTRE
 #include <lvfs_user_fs.h>
@@ -68,11 +65,4 @@ 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