X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_internal.h;h=46979e9f59be82f4d2105b44ab92c6bc428a0baf;hb=019a3b34c0f4d934266a185bcda048b1dab201ed;hp=6ddfe13a0683a39f62371de1aebad5dd204049ff;hpb=1a87510ec2aef550b5654f6edb05f6c7ee5ec78b;p=fs%2Flustre-release.git diff --git a/lustre/mgs/mgs_internal.h b/lustre/mgs/mgs_internal.h index 6ddfe13..46979e9 100644 --- a/lustre/mgs/mgs_internal.h +++ b/lustre/mgs/mgs_internal.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) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,6 +36,7 @@ #include #include #include +#include #include #define MGSSELF_NAME "_mgs" @@ -52,12 +49,12 @@ */ struct mgs_nidtbl; struct mgs_nidtbl_target { - cfs_list_t mnt_list; - struct mgs_nidtbl *mnt_fs; - u64 mnt_version; - int mnt_type; /* OST or MDT */ - cfs_time_t mnt_last_active; - struct mgs_target_info mnt_mti; + struct list_head mnt_list; + struct mgs_nidtbl *mnt_fs; + u64 mnt_version; + int mnt_type; /* OST or MDT */ + cfs_time_t mnt_last_active; + struct mgs_target_info mnt_mti; }; enum { @@ -77,30 +74,30 @@ struct fs_db; * maintain fs client nodes of mgs. */ struct mgs_fsc { - struct fs_db *mfc_fsdb; + struct fs_db *mfc_fsdb; /** * Where the fs client comes from. */ - struct obd_export *mfc_export; + struct obd_export *mfc_export; /** * list of fs clients from the same export, * protected by mgs_export_data->med_lock */ - cfs_list_t mfc_export_list; + struct list_head mfc_export_list; /** * list of fs clients in the same fsdb, protected by fsdb->fsdb_mutex */ - cfs_list_t mfc_fsdb_list; - unsigned mfc_ir_capable:1; + struct list_head mfc_fsdb_list; + unsigned mfc_ir_capable:1; }; struct mgs_nidtbl { - struct fs_db *mn_fsdb; - struct file *mn_version_file; - struct mutex mn_lock; - u64 mn_version; - int mn_nr_targets; - cfs_list_t mn_targets; + struct fs_db *mn_fsdb; + struct file *mn_version_file; + struct mutex mn_lock; + u64 mn_version; + int mn_nr_targets; + struct list_head mn_targets; }; struct mgs_tgt_srpc_conf { @@ -117,43 +114,53 @@ struct mgs_tgt_srpc_conf { #define FSDB_MGS_SELF (3) /* for '_mgs', used by sptlrpc */ #define FSDB_OSCNAME18 (4) /* old 1.8 style OSC naming */ #define FSDB_UDESC (5) /* sptlrpc user desc, will be obsolete */ +#define FSDB_REVOKING_PARAMS (6) /* DLM lock is being revoked */ struct fs_db { - char fsdb_name[9]; - cfs_list_t fsdb_list; /* list of databases */ + char fsdb_name[20]; + struct list_head fsdb_list; /* list of databases */ struct mutex fsdb_mutex; - void *fsdb_ost_index_map; /* bitmap of used indicies */ - void *fsdb_mdt_index_map; /* bitmap of used indicies */ - int fsdb_mdt_count; - char *fsdb_clilov; /* COMPAT_146 client lov name */ - char *fsdb_clilmv; - unsigned long fsdb_flags; - __u32 fsdb_gen; + union { + void *fsdb_ost_index_map; /* bitmap of used indicies */ + void *fsdb_barrier_map; /* bitmap of barrier */ + }; + void *fsdb_mdt_index_map; /* bitmap of used indicies */ + atomic_t fsdb_ref; + int fsdb_mdt_count; + char *fsdb_clilov; /* COMPAT_146 client lov name */ + char *fsdb_clilmv; + unsigned long fsdb_flags; + __u32 fsdb_barrier_status; + __u32 fsdb_barrier_timeout; + time_t fsdb_barrier_latest_create_time; /* in-memory copy of the srpc rules, guarded by fsdb_lock */ struct sptlrpc_rule_set fsdb_srpc_gen; struct mgs_tgt_srpc_conf *fsdb_srpc_tgt; /* list of fs clients, mgs_fsc. protected by mgs_mutex */ - cfs_list_t fsdb_clients; + struct list_head fsdb_clients; int fsdb_nonir_clients; int fsdb_ir_state; /* Target NIDs Table */ struct mgs_nidtbl fsdb_nidtbl; - /* async thread to notify clients */ - struct mgs_device *fsdb_mgs; - cfs_waitq_t fsdb_notify_waitq; - struct completion fsdb_notify_comp; - cfs_time_t fsdb_notify_start; - cfs_atomic_t fsdb_notify_phase; - volatile int fsdb_notify_async:1, - fsdb_notify_stop:1; - /* statistic data */ - unsigned int fsdb_notify_total; - unsigned int fsdb_notify_max; - unsigned int fsdb_notify_count; + /* async thread to notify clients */ + struct mgs_device *fsdb_mgs; + wait_queue_head_t fsdb_notify_waitq; + struct completion fsdb_notify_comp; + cfs_time_t fsdb_notify_start; + atomic_t fsdb_notify_phase; + volatile unsigned int fsdb_notify_async:1, + fsdb_notify_stop:1, + fsdb_has_lproc_entry:1, + fsdb_barrier_disabled:1; + /* statistic data */ + unsigned int fsdb_notify_total; + unsigned int fsdb_notify_max; + unsigned int fsdb_notify_count; + __u32 fsdb_gen; }; struct mgs_device { @@ -163,16 +170,19 @@ struct mgs_device { struct obd_export *mgs_bottom_exp; struct dt_object *mgs_configs_dir; struct dt_object *mgs_nidtbl_dir; - cfs_list_t mgs_fs_db_list; + struct list_head mgs_fs_db_list; spinlock_t mgs_lock; /* covers mgs_fs_db_list */ - cfs_proc_dir_entry_t *mgs_proc_live; - cfs_proc_dir_entry_t *mgs_proc_osd; - cfs_proc_dir_entry_t *mgs_proc_fstype; - cfs_proc_dir_entry_t *mgs_proc_mntdev; + struct proc_dir_entry *mgs_proc_live; + struct proc_dir_entry *mgs_proc_osd; + struct proc_dir_entry *mgs_proc_fstype; + struct proc_dir_entry *mgs_proc_mntdev; cfs_time_t mgs_start_time; struct obd_device *mgs_obd; struct local_oid_storage *mgs_los; struct mutex mgs_mutex; + struct mutex mgs_health_mutex; + struct rw_semaphore mgs_barrier_rwsem; + struct lu_target mgs_lut; }; /* this is a top object */ @@ -185,18 +195,25 @@ struct mgs_object { int mgs_init_fsdb_list(struct mgs_device *mgs); int mgs_cleanup_fsdb_list(struct mgs_device *mgs); -int mgs_find_or_make_fsdb(const struct lu_env *env, struct mgs_device *mgs, char *name, - struct fs_db **dbh); -struct fs_db *mgs_find_fsdb(struct mgs_device *mgs, char *fsname); -int mgs_get_fsdb_srpc_from_llog(const struct lu_env *env, struct mgs_device *mgs, struct fs_db *fsdb); -int mgs_check_index(const struct lu_env *env, struct mgs_device *mgs, struct mgs_target_info *mti); -int mgs_check_failnid(const struct lu_env *env, struct mgs_device *mgs, struct mgs_target_info *mti); -int mgs_write_log_target(const struct lu_env *env, struct mgs_device *mgs, struct mgs_target_info *mti, - struct fs_db *fsdb); +int mgs__mgs_fsdb_setup(const struct lu_env *env, struct mgs_device *mgs); +int mgs_params_fsdb_setup(const struct lu_env *env, struct mgs_device *mgs); +int mgs_params_fsdb_cleanup(const struct lu_env *env, struct mgs_device *mgs); +int mgs_find_or_make_fsdb(const struct lu_env *env, struct mgs_device *mgs, + char *name, struct fs_db **dbh); +struct fs_db *mgs_find_fsdb(struct mgs_device *mgs, const char *fsname); +void mgs_put_fsdb(struct mgs_device *mgs, struct fs_db *fsdb); +int mgs_get_fsdb_srpc_from_llog(const struct lu_env *env, + struct mgs_device *mgs, struct fs_db *fsdb); +int mgs_check_index(const struct lu_env *env, struct mgs_device *mgs, + struct mgs_target_info *mti); +int mgs_write_log_target(const struct lu_env *env, struct mgs_device *mgs, + struct mgs_target_info *mti, struct fs_db *fsdb); +int mgs_replace_nids(const struct lu_env *env, struct mgs_device *mgs, + char *devname, char *nids); int mgs_erase_log(const struct lu_env *env, struct mgs_device *mgs, char *name); int mgs_erase_logs(const struct lu_env *env, struct mgs_device *mgs, - char *fsname); + const char *fsname); int mgs_setparam(const struct lu_env *env, struct mgs_device *mgs, struct lustre_cfg *lcfg, char *fsname); int mgs_list_logs(const struct lu_env *env, struct mgs_device *mgs, @@ -204,6 +221,9 @@ int mgs_list_logs(const struct lu_env *env, struct mgs_device *mgs, int mgs_pool_cmd(const struct lu_env *env, struct mgs_device *mgs, enum lcfg_command_type cmd, char *poolname, char *fsname, char *ostname); +int mgs_nodemap_cmd(const struct lu_env *env, struct mgs_device *mgs, + enum lcfg_command_type cmd, const char *nodemap_name, + char *param); /* mgs_handler.c */ int mgs_get_lock(struct obd_device *obd, struct ldlm_res_id *res, @@ -219,13 +239,13 @@ int mgs_ir_init_fs(const struct lu_env *env, struct mgs_device *mgs, void mgs_ir_fini_fs(struct mgs_device *mgs, struct fs_db *fsdb); void mgs_ir_notify_complete(struct fs_db *fsdb); int mgs_get_ir_logs(struct ptlrpc_request *req); -int lprocfs_wr_ir_state(struct file *file, const char *buffer, - unsigned long count, void *data); +int lprocfs_wr_ir_state(struct file *file, const char __user *buffer, + size_t count, void *data); int lprocfs_rd_ir_state(struct seq_file *seq, void *data); -int lprocfs_wr_ir_timeout(struct file *file, const char *buffer, - unsigned long count, void *data); -int lprocfs_rd_ir_timeout(char *page, char **start, off_t off, int count, - int *eof, void *data); +ssize_t +lprocfs_ir_timeout_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off); +int lprocfs_ir_timeout_seq_show(struct seq_file *seq, void *data); void mgs_fsc_cleanup(struct obd_export *exp); void mgs_fsc_cleanup_by_fsdb(struct fs_db *fsdb); int mgs_fsc_attach(const struct lu_env *env, struct obd_export *exp, @@ -238,26 +258,20 @@ int mgs_client_free(struct obd_export *exp); int mgs_fs_setup(const struct lu_env *env, struct mgs_device *m); int mgs_fs_cleanup(const struct lu_env *env, struct mgs_device *m); -#define strsuf(buf, suffix) (strcmp((buf)+strlen(buf)-strlen(suffix), (suffix))) -#ifdef LPROCFS -int lproc_mgs_setup(struct mgs_device *mgs, char *osd_name); -int lproc_mgs_cleanup(struct mgs_device *mgs); +#ifdef CONFIG_PROC_FS +int lproc_mgs_setup(struct mgs_device *mgs, const char *osd_name); +void lproc_mgs_cleanup(struct mgs_device *mgs); int lproc_mgs_add_live(struct mgs_device *mgs, struct fs_db *fsdb); int lproc_mgs_del_live(struct mgs_device *mgs, struct fs_db *fsdb); -void lprocfs_mgs_init_vars(struct lprocfs_static_vars *lvars); #else -static inline int lproc_mgs_setup(struct mgs_device *mgs) -{return 0;} -static inline int lproc_mgs_cleanup(struct mgs_device *mgs) +static inline int lproc_mgs_setup(struct mgs_device *mgs, const char *osd_name) {return 0;} +static inline void lproc_mgs_cleanup(struct mgs_device *mgs) +{} static inline int lproc_mgs_add_live(struct mgs_device *mgs, struct fs_db *fsdb) {return 0;} static inline int lproc_mgs_del_live(struct mgs_device *mgs, struct fs_db *fsdb) {return 0;} -static void lprocfs_mgs_init_vars(struct lprocfs_static_vars *lvars) -{ - memset(lvars, 0, sizeof(*lvars)); -} #endif /* mgs/lproc_mgs.c */ @@ -290,9 +304,16 @@ extern struct lu_context_key mgs_thread_key; static inline struct mgs_thread_info *mgs_env_info(const struct lu_env *env) { - struct mgs_thread_info *info; + struct mgs_thread_info *info; + int rc; info = lu_context_key_get(&env->le_ctx, &mgs_thread_key); + if (info == NULL) { + rc = lu_env_refill((struct lu_env *)env); + if (rc != 0) + return ERR_PTR(rc); + info = lu_context_key_get(&env->le_ctx, &mgs_thread_key); + } LASSERT(info != NULL); return info; } @@ -354,22 +375,18 @@ static inline struct dt_object* mgs_object_child(struct mgs_object *o) struct dt_object, do_lu); } -static inline struct dt_object *dt_object_child(struct dt_object *o) -{ - return container_of0(lu_object_next(&(o)->do_lu), - struct dt_object, do_lu); -} struct mgs_direntry { - cfs_list_t list; - char *name; - int len; + struct list_head mde_list; + char *mde_name; + int mde_len; }; static inline void mgs_direntry_free(struct mgs_direntry *de) { + LASSERT(list_empty(&de->mde_list)); if (de) { - LASSERT(de->len); - OBD_FREE(de->name, de->len); + LASSERT(de->mde_len); + OBD_FREE(de->mde_name, de->mde_len); OBD_FREE_PTR(de); } } @@ -382,19 +399,20 @@ static inline struct mgs_direntry *mgs_direntry_alloc(int len) if (de == NULL) return NULL; - OBD_ALLOC(de->name, len); - if (de->name == NULL) { + OBD_ALLOC(de->mde_name, len); + if (de->mde_name == NULL) { OBD_FREE_PTR(de); return NULL; } - de->len = len; + de->mde_len = len; + INIT_LIST_HEAD(&de->mde_list); return de; } /* mgs_llog.c */ int class_dentry_readdir(const struct lu_env *env, struct mgs_device *mgs, - cfs_list_t *list); + struct list_head *list); #endif /* _MGS_INTERNAL_H */