LU-14093 gss: gcc10 fixes for GSS

[fs/lustre-release.git] / lustre / utils / mount_utils.h

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index f268392..d7e4f6e 100644 (file)
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #ifndef _MOUNT_UTILS_H_
@@ -151,9 +150,9 @@ struct mount_opts {
 #ifdef HAVE_SERVER_SUPPORT
 int get_mountdata(char *, struct lustre_disk_data *);
 
-static inline char *mt_str(enum ldd_mount_type mt)
+static inline const char *mt_str(enum ldd_mount_type mt)
 {
-       static char *mount_type_string[] = {
+       static const char * const mount_type_string[] = {
                "ext3",
                "ldiskfs",
                "smfs",
@@ -164,9 +163,9 @@ static inline char *mt_str(enum ldd_mount_type mt)
        return mount_type_string[mt];
 }
 
-static inline char *mt_type(enum ldd_mount_type mt)
+static inline const char *mt_type(enum ldd_mount_type mt)
 {
-       static char *mount_type_string[] = {
+       static const char * const mount_type_string[] = {
                "osd-ldiskfs",
                "osd-ldiskfs",
                "osd-smfs",
@@ -251,8 +250,8 @@ struct module_backfs_ops {
        void   *dl_handle;
 };
 
-struct module_backfs_ops zfs_ops;
-struct module_backfs_ops ldiskfs_ops;
+extern struct module_backfs_ops zfs_ops;
+extern struct module_backfs_ops ldiskfs_ops;
 
 struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type);
 void unload_backfs_ops(struct module_backfs_ops *ops);