X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flvfs.h;h=3544b53eb657b9c1452ce5edd23436298035ab86;hb=531bbc669d66ac97a7b943ca4062a2c5b2589249;hp=f8a48d9172f569b272e46bbac68042b5ac693472;hpb=82af026a4b6c22b680929ca7b6db45b0c6a55171;p=fs%2Flustre-release.git

diff --git a/lustre/include/lvfs.h b/lustre/include/lvfs.h
index f8a48d91..3544b53 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.
@@ -17,17 +15,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -41,38 +37,38 @@
 #ifndef __LVFS_H__
 #define __LVFS_H__
 
-#define LL_FID_NAMELEN (16 + 1 + 8 + 1)
-
-#include <libcfs/libcfs.h>
-#if defined(__linux__)
-#include <linux/lvfs.h>
-#elif defined(__APPLE__)
-#include <darwin/lvfs.h>
-#elif defined(__WINNT__)
-#include <winnt/lvfs.h>
-#else
-#error Unsupported operating system.
-#endif
+#include <linux/dcache.h>
+#include <linux/err.h>
+#include <linux/fs.h>
+#include <linux/mutex.h>
+#include <linux/namei.h>
+#include <lustre_compat.h>
 
-#include <libcfs/lucache.h>
+#define OBD_RUN_CTXT_MAGIC	0xC0FFEEAA
+#define OBD_CTXT_DEBUG		/* development-only debugging */
 
+struct dt_device;
 
-#ifdef LIBLUSTRE
-#include <lvfs_user_fs.h>
+struct lvfs_run_ctxt {
+	struct vfsmount		*pwdmnt;
+	struct dentry		*pwd;
+	mm_segment_t		 fs;
+	int			 umask;
+	struct dt_device	*dt;
+#ifdef OBD_CTXT_DEBUG
+	unsigned int		 magic;
 #endif
+};
 
-/* lvfs_common.c */
-struct dentry *lvfs_fid2dentry(struct lvfs_run_ctxt *, __u64, __u32, __u64 ,void *data);
-
-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)
+static inline void OBD_SET_CTXT_MAGIC(struct lvfs_run_ctxt *ctxt)
 {
-        return sprintf(str, "%llx:%08x", (unsigned long long)id, generation);
+#ifdef OBD_CTXT_DEBUG
+	ctxt->magic = OBD_RUN_CTXT_MAGIC;
+#endif
 }
 
+/* ptlrpc_sec_ctx.c */
+void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx);
+void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx);
+
 #endif