X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_log.h;h=634a19b080e28b456ca4cfc1914e0ef91cdbee72;hb=b8a0753a3bd2953ef6c24ddd18d15786808c2066;hp=e5f5cad0c19b8d58bd2ebfb4090b0f53dd773f0b;hpb=6fe18330660980fc4ec4fd4e960f5415e571a54e;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_log.h b/lustre/include/lustre_log.h index e5f5cad..634a19b 100644 --- a/lustre/include/lustre_log.h +++ b/lustre/include/lustre_log.h @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -51,6 +51,11 @@ #ifndef _LUSTRE_LOG_H #define _LUSTRE_LOG_H +/** \defgroup log log + * + * @{ + */ + #if defined(__linux__) #include #elif defined(__APPLE__) @@ -70,20 +75,20 @@ #define LLOG_EEMPTY 4711 struct plain_handle_data { - struct list_head phd_entry; + cfs_list_t phd_entry; struct llog_handle *phd_cat_handle; struct llog_cookie phd_cookie; /* cookie of this log in its cat */ int phd_last_idx; }; struct cat_handle_data { - struct list_head chd_head; + cfs_list_t chd_head; struct llog_handle *chd_current_log; /* currently open log */ }; /* In-memory descriptor for a log object or log catalog */ struct llog_handle { - struct rw_semaphore lgh_lock; + cfs_rw_semaphore_t lgh_lock; struct llog_logid lgh_id; /* id of this log */ struct llog_log_hdr *lgh_hdr; struct file *lgh_file; @@ -106,12 +111,17 @@ int llog_init_handle(struct llog_handle *handle, int flags, extern void llog_free_handle(struct llog_handle *handle); int llog_process(struct llog_handle *loghandle, llog_cb_t cb, void *data, void *catdata); +int llog_process_flags(struct llog_handle *loghandle, llog_cb_t cb, + void *data, void *catdata, int flags); int llog_reverse_process(struct llog_handle *loghandle, llog_cb_t cb, void *data, void *catdata); extern int llog_cancel_rec(struct llog_handle *loghandle, int index); extern int llog_close(struct llog_handle *cathandle); extern int llog_get_size(struct llog_handle *loghandle); +/* llog_process flags */ +#define LLOG_FLAG_NODEAMON 0x0001 + /* llog_cat.c - catalog api */ struct llog_process_data { /** @@ -129,6 +139,7 @@ struct llog_process_data { */ int lpd_startcat; int lpd_startidx; + int lpd_flags; /** llog_process flags */ }; struct llog_process_cat_data { @@ -164,6 +175,8 @@ int llog_cat_cancel_records(struct llog_handle *cathandle, int count, struct llog_cookie *cookies); int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data, int startcat, int startidx); +int llog_cat_process_flags(struct llog_handle *cat_llh, llog_cb_t cb, void *data, + int flags, int startcat, int startidx); int llog_cat_process_thread(void *data); int llog_cat_reverse_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data); int llog_cat_set_first_idx(struct llog_handle *cathandle, int index); @@ -193,11 +206,8 @@ int llog_obd_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, struct lov_stripe_md *lsm, struct llog_cookie *logcookies, int numcookies); -int llog_cat_initialize(struct obd_device *obd, struct obd_llog_group *olg, - int idx, struct obd_uuid *uuid); int obd_llog_init(struct obd_device *obd, struct obd_llog_group *olg, - struct obd_device *disk_obd, int count, - struct llog_catid *logid, struct obd_uuid *uuid); + struct obd_device *disk_obd, int *idx); int obd_llog_finish(struct obd_device *obd, int count); @@ -256,13 +266,15 @@ struct llog_operations { /* llog_lvfs.c */ extern struct llog_operations llog_lvfs_ops; -int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd, +int llog_get_cat_list(struct obd_device *disk_obd, char *name, int idx, int count, struct llog_catid *idarray); -int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd, +int llog_put_cat_list(struct obd_device *disk_obd, char *name, int idx, int count, struct llog_catid *idarray); +#define LLOG_CTXT_FLAG_UNINITIALIZED 0x00000001 + struct llog_ctxt { int loc_idx; /* my index the obd array of ctxt's */ struct llog_gen loc_gen; @@ -275,9 +287,10 @@ struct llog_ctxt { struct llog_handle *loc_handle; struct llog_commit_master *loc_lcm; struct llog_canceld_ctxt *loc_llcd; - struct semaphore loc_sem; /* protects loc_llcd and loc_imp */ - atomic_t loc_refcount; + cfs_semaphore_t loc_sem; /* protects loc_llcd and loc_imp */ + cfs_atomic_t loc_refcount; void *llog_proc_cb; + long loc_flags; /* flags, see above defines */ }; #define LCM_NAME_SIZE 64 @@ -290,11 +303,11 @@ struct llog_commit_master { /** * Number of llcds onthis lcm. */ - atomic_t lcm_count; + cfs_atomic_t lcm_count; /** * The refcount for lcm */ - atomic_t lcm_refcount; + cfs_atomic_t lcm_refcount; /** * Thread control structure. Used for control commit thread. */ @@ -302,11 +315,11 @@ struct llog_commit_master { /** * Lock protecting list of llcds. */ - spinlock_t lcm_lock; + cfs_spinlock_t lcm_lock; /** * Llcds in flight for debugging purposes. */ - struct list_head lcm_llcds; + cfs_list_t lcm_llcds; /** * Commit thread name buffer. Only used for thread start. */ @@ -316,15 +329,15 @@ struct llog_commit_master { static inline struct llog_commit_master *lcm_get(struct llog_commit_master *lcm) { - LASSERT(atomic_read(&lcm->lcm_refcount) > 0); - atomic_inc(&lcm->lcm_refcount); + LASSERT(cfs_atomic_read(&lcm->lcm_refcount) > 0); + cfs_atomic_inc(&lcm->lcm_refcount); return lcm; } static inline void lcm_put(struct llog_commit_master *lcm) { - if (!atomic_dec_and_test(&lcm->lcm_refcount)) { + if (!cfs_atomic_dec_and_test(&lcm->lcm_refcount)) { return ; } OBD_FREE_PTR(lcm); @@ -350,7 +363,7 @@ struct llog_canceld_ctxt { /** * Link to lcm llcds list. */ - struct list_head llcd_list; + cfs_list_t llcd_list; /** * Current llcd size while gathering cookies. This should not be * more than ->llcd_size. Used for determining if we need to @@ -376,12 +389,10 @@ static inline void llog_gen_init(struct llog_ctxt *ctxt) { struct obd_device *obd = ctxt->loc_exp->exp_obd; - if (!strcmp(obd->obd_type->typ_name, LUSTRE_MDS_NAME)) - ctxt->loc_gen.mnt_cnt = obd->u.mds.mds_mount_count; - else if (!strstr(obd->obd_type->typ_name, LUSTRE_OST_NAME)) - ctxt->loc_gen.mnt_cnt = obd->u.filter.fo_mount_count; - else - ctxt->loc_gen.mnt_cnt = 0; + LASSERTF(obd->u.obt.obt_magic == OBT_MAGIC, + "%s: wrong obt magic %#x\n", + obd->obd_name, obd->u.obt.obt_magic); + ctxt->loc_gen.mnt_cnt = obd->u.obt.obt_mount_count; ctxt->loc_gen.conn_cnt++; } @@ -421,15 +432,15 @@ static inline int llog_handle2ops(struct llog_handle *loghandle, static inline int llog_data_len(int len) { - return size_round(len); + return cfs_size_round(len); } static inline struct llog_ctxt *llog_ctxt_get(struct llog_ctxt *ctxt) { - LASSERT(atomic_read(&ctxt->loc_refcount) > 0); - atomic_inc(&ctxt->loc_refcount); + LASSERT(cfs_atomic_read(&ctxt->loc_refcount) > 0); + cfs_atomic_inc(&ctxt->loc_refcount); CDEBUG(D_INFO, "GETting ctxt %p : new refcount %d\n", ctxt, - atomic_read(&ctxt->loc_refcount)); + cfs_atomic_read(&ctxt->loc_refcount)); return ctxt; } @@ -437,19 +448,19 @@ static inline void llog_ctxt_put(struct llog_ctxt *ctxt) { if (ctxt == NULL) return; - LASSERT(atomic_read(&ctxt->loc_refcount) > 0); - LASSERT(atomic_read(&ctxt->loc_refcount) < 0x5a5a5a); + LASSERT(cfs_atomic_read(&ctxt->loc_refcount) > 0); + LASSERT(cfs_atomic_read(&ctxt->loc_refcount) < 0x5a5a5a); CDEBUG(D_INFO, "PUTting ctxt %p : new refcount %d\n", ctxt, - atomic_read(&ctxt->loc_refcount) - 1); + cfs_atomic_read(&ctxt->loc_refcount) - 1); __llog_ctxt_put(ctxt); } static inline void llog_group_init(struct obd_llog_group *olg, int group) { cfs_waitq_init(&olg->olg_waitq); - spin_lock_init(&olg->olg_lock); - sema_init(&olg->olg_cat_processing, 1); - olg->olg_group = group; + cfs_spin_lock_init(&olg->olg_lock); + cfs_sema_init(&olg->olg_cat_processing, 1); + olg->olg_seq = group; } static inline void llog_group_set_export(struct obd_llog_group *olg, @@ -457,13 +468,13 @@ static inline void llog_group_set_export(struct obd_llog_group *olg, { LASSERT(exp != NULL); - spin_lock(&olg->olg_lock); + cfs_spin_lock(&olg->olg_lock); if (olg->olg_exp != NULL && olg->olg_exp != exp) CWARN("%s: export for group %d is changed: 0x%p -> 0x%p\n", - exp->exp_obd->obd_name, olg->olg_group, + exp->exp_obd->obd_name, olg->olg_seq, olg->olg_exp, exp); olg->olg_exp = exp; - spin_unlock(&olg->olg_lock); + cfs_spin_unlock(&olg->olg_lock); } static inline int llog_group_set_ctxt(struct obd_llog_group *olg, @@ -471,13 +482,13 @@ static inline int llog_group_set_ctxt(struct obd_llog_group *olg, { LASSERT(index >= 0 && index < LLOG_MAX_CTXTS); - spin_lock(&olg->olg_lock); + cfs_spin_lock(&olg->olg_lock); if (olg->olg_ctxts[index] != NULL) { - spin_unlock(&olg->olg_lock); + cfs_spin_unlock(&olg->olg_lock); return -EEXIST; } olg->olg_ctxts[index] = ctxt; - spin_unlock(&olg->olg_lock); + cfs_spin_unlock(&olg->olg_lock); return 0; } @@ -488,13 +499,13 @@ static inline struct llog_ctxt *llog_group_get_ctxt(struct obd_llog_group *olg, LASSERT(index >= 0 && index < LLOG_MAX_CTXTS); - spin_lock(&olg->olg_lock); + cfs_spin_lock(&olg->olg_lock); if (olg->olg_ctxts[index] == NULL) { ctxt = NULL; } else { ctxt = llog_ctxt_get(olg->olg_ctxts[index]); } - spin_unlock(&olg->olg_lock); + cfs_spin_unlock(&olg->olg_lock); return ctxt; } @@ -536,7 +547,7 @@ static inline int llog_write_rec(struct llog_handle *handle, + sizeof(struct llog_rec_tail); else buflen = rec->lrh_len; - LASSERT(size_round(buflen) == buflen); + LASSERT(cfs_size_round(buflen) == buflen); raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE); if (!raised) @@ -680,4 +691,6 @@ int lustre_process_log(struct super_block *sb, char *logname, int lustre_end_log(struct super_block *sb, char *logname, struct config_llog_instance *cfg); +/** @} log */ + #endif