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 42e8544..7025155 100644 (file)
--- a/lustre/include/lvfs.h
+++ b/lustre/include/lvfs.h
@@ -1,22 +1,35 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (C) 2001 Cluster File Systems, Inc. <braam@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/include/lvfs.h
  *
  * lustre VFS/process permission interface
  */
@@ -24,38 +37,37 @@
 #ifndef __LVFS_H__
 #define __LVFS_H__
 
-#define LL_FID_NAMELEN (16 + 1 + 8 + 1)
-
-#include <libcfs/kp30.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 <lustre_ucache.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;
+       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