X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.h;h=bcacce451290ae0cba1d9fa17fd5546e2705a918;hb=e5116ab831c6b7c87594c52d9bdb5a786b35b956;hp=32be5c05de2f075a29c9a77d4fa6bcd4643f75ab;hpb=66858bc059362504d201262202549099185e69ba;p=fs%2Flustre-release.git diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h index 32be5c0..bcacce4 100644 --- a/lustre/utils/mount_utils.h +++ b/lustre/utils/mount_utils.h @@ -27,7 +27,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, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -48,6 +48,17 @@ #define _SPL_ZFS_H #define _SPL_SIGNAL_H #endif +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include @@ -64,6 +75,7 @@ extern int failover; #define MO_FAILOVER 0x04 #define MO_DRYRUN 0x08 #define MO_QUOTA 0x10 +#define MO_NOHOSTID_CHECK 0x20 #define MAX_LOOP_DEVICES 16 #define INDEX_UNASSIGNED 0xFFFF @@ -71,11 +83,12 @@ extern int failover; /* 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 */ - char *mo_device; /* disk device name */ + char mo_device[128]; /* disk device name */ 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 */ - __u64 mo_device_sz; /* in KB */ + char *mo_mountopts; /* mount options for backing fs */ + __u64 mo_device_kb; /* in KB */ int mo_stripe_count; int mo_flags; int mo_mgs_failnodes; @@ -88,6 +101,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; @@ -107,29 +123,27 @@ 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); 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 get_realpath(char *path, 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); +__u64 get_device_size(char* device); /* loopback helper functions */ int file_create(char *path, __u64 size); @@ -143,39 +157,32 @@ int osd_read_ldd(char *dev, struct lustre_disk_data *ldd); 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 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); - -#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); -#endif +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 (*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); + 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); +int load_shared_keys(struct mount_opts *mop); #endif