* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define _SPL_ZFS_H
#define _SPL_SIGNAL_H
#endif
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
#include <lustre_disk.h>
#include <lustre_param.h>
char **mo_pool_vdevs; /* list of pool vdevs */
char mo_loopdev[128]; /* in case a loop dev is needed */
char mo_mkfsopts[512]; /* options to the backing-store mkfs */
+ char *mo_mountopts; /* mount options for backing fs */
__u64 mo_device_kb; /* in KB */
int mo_stripe_count;
int mo_flags;
int run_command_err(char *cmd, int cmdsz, char *error_msg);
int run_command(char *cmd, int cmdsz);
int add_param(char *buf, char *key, char *val);
+int append_param(char *buf, char *key, char *val, char sep);
int get_param(char *buf, char *key, char **val);
char *strscat(char *dst, char *src, int buflen);
char *strscpy(char *dst, char *src, int buflen);
int check_mtab_entry(char *spec1, char *spec2, char *mntpt, char *type);
int update_mtab_entry(char *spec, char *mtpt, char *type, char *opts,
int flags, int freq, int pass);
-int check_mountfsoptions(char *mountopts, char *wanted_mountopts, int justwarn);
+int check_mountfsoptions(char *mountopts, char *wanted_mountopts);
void trim_mountfsoptions(char *s);
__u64 get_device_size(char* device);
int osd_is_lustre(char *dev, unsigned *mount_type);
int osd_make_lustre(struct mkfs_opts *mop);
int osd_prepare_lustre(struct mkfs_opts *mop,
- char *default_mountopts, int default_len,
- char *always_mountopts, int always_len);
+ char *wanted_mountopts, size_t len);
+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_enable_quota(struct mkfs_opts *mop);
int (*is_lustre)(char *dev, enum ldd_mount_type *mount_type);
int (*make_lustre)(struct mkfs_opts *mop);
int (*prepare_lustre)(struct mkfs_opts *mop,
- char *default_mountopts, int default_len,
- char *always_mountopts, int always_len);
+ char *wanted_mountopts, size_t len);
+ int (*fix_mountopts)(struct mkfs_opts *mop,
+ char *mountopts, size_t len);
int (*tune_lustre)(char *dev, struct mount_opts *mop);
int (*label_lustre)(struct mount_opts *mop);
int (*enable_quota)(struct mkfs_opts *mop);