LU-8735 llite: Return -ERESTARTSYS in range_lock()

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

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index bcacce4..2b1ac8f 100644 (file)
--- 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/
@@ -76,6 +72,7 @@ extern int failover;
 #define MO_DRYRUN              0x08
 #define MO_QUOTA               0x10
 #define MO_NOHOSTID_CHECK      0x20
+#define MO_RENAME              0x40
 
 #define MAX_LOOP_DEVICES       16
 #define INDEX_UNASSIGNED       0xFFFF
@@ -111,6 +108,7 @@ struct mount_opts {
        int      mo_have_mgsnid;
        int      mo_md_stripe_cache_size;
        int      mo_nosvc;
+       int      mo_max_sectors_kb;
 };
 
 int get_mountdata(char *, struct lustre_disk_data *);
@@ -144,6 +142,8 @@ int update_utab_entry(struct mount_opts *mop);
 int check_mountfsoptions(char *mountopts, char *wanted_mountopts);
 void trim_mountfsoptions(char *s);
 __u64 get_device_size(char* device);
+int lustre_rename_fsname(struct mkfs_opts *mop, const char *mntpt,
+                        const char *oldname);
 
 /* loopback helper functions */
 int file_create(char *path, __u64 size);
@@ -161,6 +161,7 @@ int osd_prepare_lustre(struct mkfs_opts *mop,
 int osd_fix_mountopts(struct mkfs_opts *mop, char *mountopts, size_t len);
 int osd_tune_lustre(char *dev, struct mount_opts *mop);
 int osd_label_lustre(struct mount_opts *mop);
+int osd_rename_fsname(struct mkfs_opts *mop, const char *oldname);
 int osd_enable_quota(struct mkfs_opts *mop);
 int osd_init(void);
 void osd_fini(void);
@@ -179,10 +180,18 @@ struct module_backfs_ops {
        int     (*tune_lustre)(char *dev, struct mount_opts *mop);
        int     (*label_lustre)(struct mount_opts *mop);
        int     (*enable_quota)(struct mkfs_opts *mop);
+       int     (*rename_fsname)(struct mkfs_opts *mop, const char *oldname);
        void   *dl_handle;
 };
 
 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