X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.h;h=613dd65504aabc7ecef07a446a1400257fb88efe;hb=3344e648236778565a8838ca85c655446ee7028c;hp=ce220c19067f67a1018b40dab91f8585f93b8273;hpb=b3058c3c1db159967cfa2f1b4db1b13e5a562457;p=fs%2Flustre-release.git diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h index ce220c1..613dd65 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, 2013, Intel Corporation. + * Copyright (c) 2012, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -48,7 +44,18 @@ #define _SPL_ZFS_H #define _SPL_SIGNAL_H #endif -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include extern char *progname; @@ -64,10 +71,16 @@ extern int failover; #define MO_FAILOVER 0x04 #define MO_DRYRUN 0x08 #define MO_QUOTA 0x10 +#define MO_NOHOSTID_CHECK 0x20 +#define MO_RENAME 0x40 +#define MO_ERASE_ALL 0x80 #define MAX_LOOP_DEVICES 16 #define INDEX_UNASSIGNED 0xFFFF +/* Maximum length of on-disk parameters in the form key= */ +#define PARAM_MAX 4096 + /* used to describe the options to format the lustre disk, not persistent */ struct mkfs_opts { struct lustre_disk_data mo_ldd; /* to be written in MOUNT_DATA_FILE */ @@ -75,6 +88,7 @@ struct mkfs_opts { 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; @@ -88,6 +102,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; @@ -95,40 +112,65 @@ 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 *); +static inline char *mt_str(enum ldd_mount_type mt) +{ + static char *mount_type_string[] = { + "ext3", + "ldiskfs", + "smfs", + "reiserfs", + "ldiskfs2", + "zfs", + }; + return mount_type_string[mt]; +} + +static inline char *mt_type(enum ldd_mount_type mt) +{ + static char *mount_type_string[] = { + "osd-ldiskfs", + "osd-ldiskfs", + "osd-smfs", + "osd-reiserfs", + "osd-ldiskfs", + "osd-zfs", + }; + return mount_type_string[mt]; +} + #define MT_STR(data) mt_str((data)->ldd_mount_type) -#undef IS_MDT #define IS_MDT(data) ((data)->ldd_flags & LDD_F_SV_TYPE_MDT) -#undef IS_OST #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) +#define IS_SEPARATED_MGS(data) ((data)->ldd_flags == LDD_F_SV_TYPE_MGS) +#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); 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 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 is_block(char *devname); -void disp_old_e2fsprogs_msg(const char *feature, int make_backfs); -int make_lustre_backfs(struct mkfs_opts *mop); -int write_local_files(struct mkfs_opts *mop); -int read_local_files(struct mkfs_opts *mop); -int is_lustre_target(struct mkfs_opts *mop); +int lustre_rename_fsname(struct mkfs_opts *mop, const char *mntpt, + const char *oldname); /* loopback helper functions */ int file_create(char *path, __u64 size); @@ -139,42 +181,48 @@ int loop_cleanup(struct mkfs_opts *mop); /* generic target support */ int osd_write_ldd(struct mkfs_opts *mop); int osd_read_ldd(char *dev, struct lustre_disk_data *ldd); +int osd_erase_ldd(struct mkfs_opts *mop, char *param); +void osd_print_ldd_params(struct mkfs_opts *mop); 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_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); -int ldiskfs_write_ldd(struct mkfs_opts *mop); -int ldiskfs_read_ldd(char *dev, struct lustre_disk_data *ldd); -int ldiskfs_is_lustre(char *dev, unsigned *mount_type); -int ldiskfs_make_lustre(struct mkfs_opts *mop); -int ldiskfs_prepare_lustre(struct mkfs_opts *mop, - char *default_mountopts, int default_len, - char *always_mountopts, int always_len); -int ldiskfs_tune_lustre(char *dev, struct mount_opts *mop); -int ldiskfs_label_lustre(struct mount_opts *mop); -int ldiskfs_enable_quota(struct mkfs_opts *mop); -int ldiskfs_init(void); -void ldiskfs_fini(void); +struct module_backfs_ops { + int (*init)(void); + void (*fini)(void); + int (*read_ldd)(char *ds, struct lustre_disk_data *ldd); + int (*write_ldd)(struct mkfs_opts *mop); + int (*erase_ldd)(struct mkfs_opts *mop, char *param); + void (*print_ldd_params)(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 *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); + int (*rename_fsname)(struct mkfs_opts *mop, const char *oldname); + void *dl_handle; +}; -#ifdef HAVE_ZFS_OSD -int zfs_write_ldd(struct mkfs_opts *mop); -int zfs_read_ldd(char *ds, struct lustre_disk_data *ldd); -int zfs_is_lustre(char *dev, unsigned *mount_type); -int zfs_make_lustre(struct mkfs_opts *mop); -int zfs_prepare_lustre(struct mkfs_opts *mop, - char *default_mountopts, int default_len, - char *always_mountopts, int always_len); -int zfs_tune_lustre(char *dev, struct mount_opts *mop); -int zfs_label_lustre(struct mount_opts *mop); -int zfs_init(void); -void zfs_fini(void); +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