X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_internal.h;h=d400c671c6f67575d1bb9a04ba9941f34c43470f;hb=83f04354ff68a14d7492e35a9576c91492a1206c;hp=0a33f81b4381682e2db0ac98f3651299fdffd2be;hpb=392471b575ad15eb64a10e83e3080aeaf94bca9e;p=fs%2Flustre-release.git diff --git a/lustre/mgs/mgs_internal.h b/lustre/mgs/mgs_internal.h index 0a33f81..d400c67 100644 --- a/lustre/mgs/mgs_internal.h +++ b/lustre/mgs/mgs_internal.h @@ -53,12 +53,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 { @@ -78,30 +78,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 { @@ -121,23 +121,23 @@ struct mgs_tgt_srpc_conf { #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[9]; + 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; + 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; /* 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; @@ -146,10 +146,10 @@ struct fs_db { /* 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; + 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; /* statistic data */ @@ -165,12 +165,12 @@ 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; @@ -217,7 +217,7 @@ int mgs_pool_cmd(const struct lu_env *env, struct mgs_device *mgs, char *ostname); int mgs_nodemap_cmd(const struct lu_env *env, struct mgs_device *mgs, enum lcfg_command_type cmd, const char *nodemap_name, - const char *param); + char *param); /* mgs_handler.c */ int mgs_get_lock(struct obd_device *obd, struct ldlm_res_id *res, @@ -375,16 +375,17 @@ static inline struct dt_object *dt_object_child(struct dt_object *o) 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); } } @@ -397,19 +398,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 */