X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flov%2Flov_internal.h;h=cefcc3f92312a40d5350863c8d5b7a1fd194bf27;hp=c9468ae77601e6b07f07ee141ca02c5582c7e27d;hb=8ea6a840e00e40220ab769ec329e10f0ad190c09;hpb=1aad983a07178319e26949ae36edbf5945e87c24 diff --git a/lustre/lov/lov_internal.h b/lustre/lov/lov_internal.h index c9468ae..cefcc3f 100644 --- a/lustre/lov/lov_internal.h +++ b/lustre/lov/lov_internal.h @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -37,11 +37,12 @@ #ifndef LOV_INTERNAL_H #define LOV_INTERNAL_H +#include #include struct lov_lock_handles { struct portals_handle llh_handle; - atomic_t llh_refcount; + cfs_atomic_t llh_refcount; int llh_stripe_count; struct lustre_handle llh_handles[0]; }; @@ -50,7 +51,7 @@ struct lov_request { struct obd_info rq_oi; struct lov_request_set *rq_rqset; - struct list_head rq_link; + cfs_list_t rq_link; int rq_idx; /* index in lov->tgts array */ int rq_stripe; /* stripe number */ @@ -65,7 +66,7 @@ struct lov_request { struct lov_request_set { struct ldlm_enqueue_info*set_ei; struct obd_info *set_oi; - atomic_t set_refcount; + cfs_atomic_t set_refcount; struct obd_export *set_exp; /* XXX: There is @set_exp already, however obd_statfs gets obd_device only. */ @@ -79,37 +80,19 @@ struct lov_request_set { obd_count set_oabufs; struct brw_page *set_pga; struct lov_lock_handles *set_lockh; - struct list_head set_list; + cfs_list_t set_list; + cfs_waitq_t set_waitq; + cfs_spinlock_t set_lock; }; -#define LOV_AP_MAGIC 8200 - -struct lov_async_page { - int lap_magic; - int lap_stripe; - obd_off lap_sub_offset; - obd_id lap_loi_id; - obd_gr lap_loi_gr; - void *lap_sub_cookie; - struct obd_async_page_ops *lap_caller_ops; - void *lap_caller_data; -}; - -static inline struct lov_async_page *lap_from_cookie(void *ptr) -{ - struct lov_async_page *ap = ptr; - LASSERT(ap->lap_magic == LOV_AP_MAGIC); - return ap; -} - extern cfs_mem_cache_t *lov_oinfo_slab; static inline void lov_llh_addref(void *llhp) { struct lov_lock_handles *llh = llhp; - atomic_inc(&llh->llh_refcount); + cfs_atomic_inc(&llh->llh_refcount); CDEBUG(D_INFO, "GETting llh %p : new refcount %d\n", llh, - atomic_read(&llh->llh_refcount)); + cfs_atomic_read(&llh->llh_refcount)); } static inline struct lov_lock_handles *lov_llh_new(struct lov_stripe_md *lsm) @@ -120,13 +103,28 @@ static inline struct lov_lock_handles *lov_llh_new(struct lov_stripe_md *lsm) sizeof(*llh->llh_handles) * lsm->lsm_stripe_count); if (llh == NULL) return NULL; - atomic_set(&llh->llh_refcount, 2); + cfs_atomic_set(&llh->llh_refcount, 2); llh->llh_stripe_count = lsm->lsm_stripe_count; CFS_INIT_LIST_HEAD(&llh->llh_handle.h_link); class_handle_hash(&llh->llh_handle, lov_llh_addref); return llh; } +void lov_finish_set(struct lov_request_set *set); + +static inline void lov_get_reqset(struct lov_request_set *set) +{ + LASSERT(set != NULL); + LASSERT(cfs_atomic_read(&set->set_refcount) > 0); + cfs_atomic_inc(&set->set_refcount); +} + +static inline void lov_put_reqset(struct lov_request_set *set) +{ + if (cfs_atomic_dec_and_test(&set->set_refcount)) + lov_finish_set(set); +} + static inline struct lov_lock_handles * lov_handle2llh(struct lustre_handle *handle) { @@ -137,14 +135,14 @@ lov_handle2llh(struct lustre_handle *handle) static inline void lov_llh_put(struct lov_lock_handles *llh) { CDEBUG(D_INFO, "PUTting llh %p : new refcount %d\n", llh, - atomic_read(&llh->llh_refcount) - 1); - LASSERT(atomic_read(&llh->llh_refcount) > 0 && - atomic_read(&llh->llh_refcount) < 0x5a5a); - if (atomic_dec_and_test(&llh->llh_refcount)) { + cfs_atomic_read(&llh->llh_refcount) - 1); + LASSERT(cfs_atomic_read(&llh->llh_refcount) > 0 && + cfs_atomic_read(&llh->llh_refcount) < 0x5a5a); + if (cfs_atomic_dec_and_test(&llh->llh_refcount)) { class_handle_unhash(&llh->llh_handle); - /* The structure may be held by other threads because RCU. + /* The structure may be held by other threads because RCU. * -jxiong */ - if (atomic_read(&llh->llh_refcount)) + if (cfs_atomic_read(&llh->llh_refcount)) return; OBD_FREE_RCU(llh, sizeof *llh + @@ -163,6 +161,8 @@ int lov_merge_lvb(struct obd_export *exp, struct lov_stripe_md *lsm, struct ost_lvb *lvb, int kms_only); int lov_adjust_kms(struct obd_export *exp, struct lov_stripe_md *lsm, obd_off size, int shrink); +int lov_merge_lvb_kms(struct lov_stripe_md *lsm, + struct ost_lvb *lvb, __u64 *kms_place); /* lov_offset.c */ obd_size lov_stripe_size(struct lov_stripe_md *lsm, obd_size ost_size, @@ -180,14 +180,17 @@ int lov_stripe_number(struct lov_stripe_md *lsm, obd_off lov_off); #define LOV_USES_ASSIGNED_STRIPE 0 #define LOV_USES_DEFAULT_STRIPE 1 int qos_add_tgt(struct obd_device *obd, __u32 index); -int qos_del_tgt(struct obd_device *obd, __u32 index); +int qos_del_tgt(struct obd_device *obd, struct lov_tgt_desc *tgt); void qos_shrink_lsm(struct lov_request_set *set); int qos_prep_create(struct obd_export *exp, struct lov_request_set *set); void qos_update(struct lov_obd *lov); +void qos_statfs_done(struct lov_obd *lov); +void qos_statfs_update(struct obd_device *obd, __u64 max_age, int wait); int qos_remedy_create(struct lov_request_set *set, struct lov_request *req); /* lov_request.c */ void lov_set_add_req(struct lov_request *req, struct lov_request_set *set); +int lov_finished_set(struct lov_request_set *set); void lov_update_set(struct lov_request_set *set, struct lov_request *req, int rc); int lov_update_common_set(struct lov_request_set *set, @@ -196,8 +199,7 @@ int lov_prep_create_set(struct obd_export *exp, struct obd_info *oifo, struct lov_stripe_md **ea, struct obdo *src_oa, struct obd_trans_info *oti, struct lov_request_set **reqset); -int lov_update_create_set(struct lov_request_set *set, - struct lov_request *req, int rc); +int cb_create_update(void *cookie, int rc); int lov_fini_create_set(struct lov_request_set *set, struct lov_stripe_md **ea); int lov_prep_brw_set(struct obd_export *exp, struct obd_info *oinfo, obd_count oa_bufs, struct brw_page *pga, @@ -225,9 +227,8 @@ int lov_prep_punch_set(struct obd_export *exp, struct obd_info *oinfo, struct lov_request_set **reqset); int lov_fini_punch_set(struct lov_request_set *set); int lov_prep_sync_set(struct obd_export *exp, struct obd_info *obd_info, - struct obdo *src_oa, - struct lov_stripe_md *lsm, obd_off start, - obd_off end, struct lov_request_set **reqset); + obd_off start, obd_off end, + struct lov_request_set **reqset); int lov_fini_sync_set(struct lov_request_set *set); int lov_prep_enqueue_set(struct obd_export *exp, struct obd_info *oinfo, struct ldlm_enqueue_info *einfo, @@ -254,6 +255,7 @@ void lov_update_statfs(struct obd_statfs *osfs, struct obd_statfs *lov_sfs, int lov_fini_statfs(struct obd_device *obd, struct obd_statfs *osfs, int success); int lov_fini_statfs_set(struct lov_request_set *set); +int lov_statfs_interpret(struct ptlrpc_request_set *rqset, void *data, int rc); /* lov_obd.c */ void lov_fix_desc(struct lov_desc *desc); @@ -262,13 +264,16 @@ void lov_fix_desc_stripe_count(__u32 *val); void lov_fix_desc_pattern(__u32 *val); void lov_fix_desc_qos_maxage(__u32 *val); int lov_get_stripecnt(struct lov_obd *lov, __u32 stripe_count); -void lov_getref(struct obd_device *obd); -void lov_putref(struct obd_device *obd); - +int lov_connect_obd(struct obd_device *obd, __u32 index, int activate, + struct obd_connect_data *data); +int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg); +int lov_process_config_base(struct obd_device *obd, struct lustre_cfg *lcfg, + __u32 *indexp, int *genp); +int lov_del_target(struct obd_device *obd, __u32 index, + struct obd_uuid *uuidp, int gen); /* lov_log.c */ int lov_llog_init(struct obd_device *obd, struct obd_llog_group *olg, - struct obd_device *tgt, int count, struct llog_catid *logid, - struct obd_uuid *uuid); + struct obd_device *tgt, int *idx); int lov_llog_finish(struct obd_device *obd, int count); /* lov_pack.c */ @@ -276,7 +281,7 @@ int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmm, struct lov_stripe_md *lsm); int lov_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp, struct lov_mds_md *lmm, int lmm_bytes); -int lov_setstripe(struct obd_export *exp, +int lov_setstripe(struct obd_export *exp, int max_lmm_size, struct lov_stripe_md **lsmp, struct lov_user_md *lump); int lov_setea(struct obd_export *exp, struct lov_stripe_md **lsmp, struct lov_user_md *lump); @@ -287,18 +292,13 @@ int lov_alloc_memmd(struct lov_stripe_md **lsmp, int stripe_count, void lov_free_memmd(struct lov_stripe_md **lsmp); void lov_dump_lmm_v1(int level, struct lov_mds_md_v1 *lmm); -void lov_dump_lmm_join(int level, struct lov_mds_md_join *lmmj); void lov_dump_lmm_v3(int level, struct lov_mds_md_v3 *lmm); void lov_dump_lmm(int level, void *lmm); /* lov_ea.c */ -int lov_unpackmd_join(struct lov_obd *lov, struct lov_stripe_md *lsm, - struct lov_mds_md *lmm); struct lov_stripe_md *lsm_alloc_plain(int stripe_count, int *size); void lsm_free_plain(struct lov_stripe_md *lsm); -struct lov_extent *lovea_idx2le(struct lov_stripe_md *lsm, int stripe_no); -struct lov_extent *lovea_off2le(struct lov_stripe_md *lsm, obd_off lov_off); int lovea_destroy_object(struct lov_obd *lov, struct lov_stripe_md *lsm, struct obdo *oa, void *data); /* lproc_lov.c */ @@ -312,12 +312,15 @@ static inline void lprocfs_lov_init_vars(struct lprocfs_static_vars *lvars) } #endif +/* lov_cl.c */ +extern struct lu_device_type lov_device_type; + /* pools */ -extern lustre_hash_ops_t pool_hash_operations; +extern cfs_hash_ops_t pool_hash_operations; /* ost_pool methods */ int lov_ost_pool_init(struct ost_pool *op, unsigned int count); -int lov_ost_pool_extend(struct ost_pool *op, unsigned int max_count); -int lov_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int max_count); +int lov_ost_pool_extend(struct ost_pool *op, unsigned int min_count); +int lov_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count); int lov_ost_pool_remove(struct ost_pool *op, __u32 idx); int lov_ost_pool_free(struct ost_pool *op); @@ -329,6 +332,36 @@ int lov_pool_remove(struct obd_device *obd, char *poolname, char *ostname); void lov_dump_pool(int level, struct pool_desc *pool); struct pool_desc *lov_find_pool(struct lov_obd *lov, char *poolname); int lov_check_index_in_pool(__u32 idx, struct pool_desc *pool); - +void lov_pool_putref(struct pool_desc *pool); + +#if BITS_PER_LONG == 64 +# define ll_do_div64(n,base) ({ \ + uint64_t __base = (base); \ + uint64_t __rem; \ + __rem = ((uint64_t)(n)) % __base; \ + (n) = ((uint64_t)(n)) / __base; \ + __rem; \ + }) +#elif BITS_PER_LONG == 32 +# define ll_do_div64(n,base) ({ \ + uint64_t __rem; \ + if ((sizeof(base) > 4) && (((base)&0xffffffff00000000ULL) != 0)) { \ + int __remainder; \ + LASSERTF(!((base) & (LOV_MIN_STRIPE_SIZE - 1)), "64 bit lov "\ + "division %llu / %llu\n", (n), (base)); \ + __remainder = (n) & (LOV_MIN_STRIPE_SIZE - 1); \ + (n) >>= LOV_MIN_STRIPE_BITS; \ + (base) >>= LOV_MIN_STRIPE_BITS; \ + __rem = do_div(n, base); \ + __rem <<= LOV_MIN_STRIPE_BITS; \ + __rem += __remainder; \ + } else { \ + __rem = do_div(n, base); \ + } \ + __rem; \ + }) +#else +#error Unsupported architecture. +#endif #endif