X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.h;h=427e4c5b7368629353f47d94e9c190e5217af72b;hb=6f56f71b407a8c14db4c2accd37da5b4feecde1a;hp=ae238ebe617764897fcdd7bf271cded54bec8ac1;hpb=7b654fc673a2570ab4a828c2a7b213cee8b5b0cc;p=fs%2Flustre-release.git

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index ae238eb..427e4c5 100644
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -15,11 +15,7 @@
  *
  * 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
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -58,6 +54,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <libcfs/util/list.h>
 #include <lustre_disk.h>
 #include <lustre_param.h>
 
@@ -100,6 +97,9 @@ struct mount_opts {
 	char	*mo_usource;		/* user-specified mount device */
 	char	*mo_source;		/* our mount device name */
 	char	 mo_target[PATH_MAX];	/* mount directory */
+#ifdef HAVE_GSS
+	char	 mo_skpath[PATH_MAX];	/* shared key file/directory */
+#endif
 	int	 mo_nomtab;
 	int	 mo_fake;
 	int	 mo_force;
@@ -119,6 +119,10 @@ int get_mountdata(char *, struct lustre_disk_data *);
 #define IS_OST(data)   ((data)->ldd_flags & LDD_F_SV_TYPE_OST)
 #undef IS_MGS
 #define IS_MGS(data)  ((data)->ldd_flags & LDD_F_SV_TYPE_MGS)
+#undef IS_SERVER
+#define IS_SERVER(data) ((data)->ldd_flags & (LDD_F_SV_TYPE_MGS | \
+			  LDD_F_SV_TYPE_MDT | LDD_F_SV_TYPE_OST))
+
 
 /* mkfs/mount helper functions */
 void fatal(void);
@@ -176,5 +180,12 @@ struct module_backfs_ops {
 
 struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type);
 void unload_backfs_ops(struct module_backfs_ops *ops);
-
+#ifdef HAVE_OPENSSL_SSK
+int load_shared_keys(struct mount_opts *mop);
+#else
+static inline int load_shared_keys(struct mount_opts *mop)
+{
+	return EOPNOTSUPP;
+}
+#endif
 #endif