LU-14195 lustre: remove 'fs' from 'struct lvfs_run_ctxt'

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

diff --git a/lustre/include/lvfs.h b/lustre/include/lvfs.h
index 4079429..7025155 100644 (file)
--- a/lustre/include/lvfs.h
+++ b/lustre/include/lvfs.h
@@ -15,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/
@@ -39,17 +37,34 @@
 #ifndef __LVFS_H__
 #define __LVFS_H__
 
-#include <libcfs/libcfs.h>
+#include <linux/dcache.h>
+#include <linux/err.h>
+#include <linux/fs.h>
+#include <linux/mutex.h>
+#include <linux/namei.h>
+#include <lustre_compat.h>
+
+#define OBD_RUN_CTXT_MAGIC     0xC0FFEEAA
+#define OBD_CTXT_DEBUG         /* development-only debugging */
+
+struct dt_device;
+
+struct lvfs_run_ctxt {
+       struct vfsmount         *pwdmnt;
+       struct dentry           *pwd;
+       int                      umask;
+       struct dt_device        *dt;
+#ifdef OBD_CTXT_DEBUG
+       unsigned int             magic;
+#endif
+};
 
-#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.
+static inline void OBD_SET_CTXT_MAGIC(struct lvfs_run_ctxt *ctxt)
+{
+#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);