X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosp%2Fosp_internal.h;h=0871d8da24fc8e7ceed6b675a8690210d8fd7293;hb=de73bdafb0e0ab187865dcdcc76c0f48e1b5239e;hp=75821a5d76c5b486182362d6c447ba8941f42111;hpb=303ea892488b985ba84e6c8e1481f6c7c914c7ed;p=fs%2Flustre-release.git diff --git a/lustre/osp/osp_internal.h b/lustre/osp/osp_internal.h index 75821a5..0871d8da 100644 --- a/lustre/osp/osp_internal.h +++ b/lustre/osp/osp_internal.h @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, Intel Corporation. + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -44,6 +44,7 @@ #include #include #include +#include #include /* @@ -64,10 +65,40 @@ struct osp_id_tracker { cfs_atomic_t otr_refcount; }; +struct osp_precreate { + /* + * Precreation pool + */ + spinlock_t osp_pre_lock; + + /* last fid to assign in creation */ + struct lu_fid osp_pre_used_fid; + /* last created id OST reported, next-created - available id's */ + struct lu_fid osp_pre_last_created_fid; + /* how many ids are reserved in declare, we shouldn't block in create */ + __u64 osp_pre_reserved; + /* consumers (who needs new ids) wait here */ + wait_queue_head_t osp_pre_user_waitq; + /* current precreation status: working, failed, stopping? */ + int osp_pre_status; + /* how many to precreate next time */ + int osp_pre_grow_count; + int osp_pre_min_grow_count; + int osp_pre_max_grow_count; + /* whether to grow precreation window next time or not */ + int osp_pre_grow_slow; + /* cleaning up orphans or recreating missing objects */ + int osp_pre_recovering; +}; + struct osp_device { struct dt_device opd_dt_dev; /* corresponded OST index */ int opd_index; + + /* corrsponded MDT index, which will be used when connecting to OST + * for validating the connection (see ofd_parse_connect_data) */ + int opd_group; /* device used to store persistent state (llogs, last ids) */ struct obd_export *opd_storage_exp; struct dt_device *opd_storage; @@ -93,40 +124,19 @@ struct osp_device { int opd_got_disconnected; int opd_imp_connected; int opd_imp_active; - int opd_imp_seen_connected:1, + unsigned int opd_imp_seen_connected:1, opd_connect_mdt:1; /* whether local recovery is completed: * reported via ->ldo_recovery_complete() */ int opd_recovery_completed; - /* - * Precreation pool - */ - spinlock_t opd_pre_lock; - - /* last fid to assign in creation */ - struct lu_fid opd_pre_used_fid; - /* last created id OST reported, next-created - available id's */ - struct lu_fid opd_pre_last_created_fid; - /* how many ids are reserved in declare, we shouldn't block in create */ - __u64 opd_pre_reserved; + /* precreate structure for OSP */ + struct osp_precreate *opd_pre; /* dedicate precreate thread */ struct ptlrpc_thread opd_pre_thread; /* thread waits for signals about pool going empty */ - cfs_waitq_t opd_pre_waitq; - /* consumers (who needs new ids) wait here */ - cfs_waitq_t opd_pre_user_waitq; - /* current precreation status: working, failed, stopping? */ - int opd_pre_status; - /* how many to precreate next time */ - int opd_pre_grow_count; - int opd_pre_min_grow_count; - int opd_pre_max_grow_count; - /* whether to grow precreation window next time or not */ - int opd_pre_grow_slow; - /* cleaning up orphans or recreating missing objects */ - int opd_pre_recovering; + wait_queue_head_t opd_pre_waitq; /* * OST synchronization @@ -140,7 +150,7 @@ struct osp_device { int opd_syn_prev_done; /* found records */ struct ptlrpc_thread opd_syn_thread; - cfs_waitq_t opd_syn_waitq; + wait_queue_head_t opd_syn_waitq; /* list of remotely committed rpc */ cfs_list_t opd_syn_committed_there; /* number of changes being under sync */ @@ -168,7 +178,7 @@ struct osp_device { */ struct obd_statfs opd_statfs; cfs_time_t opd_statfs_fresh_till; - cfs_timer_t opd_statfs_timer; + struct timer_list opd_statfs_timer; int opd_statfs_update_in_progress; /* how often to update statfs data */ int opd_statfs_maxage; @@ -176,13 +186,25 @@ struct osp_device { cfs_proc_dir_entry_t *opd_symlink; }; -extern cfs_mem_cache_t *osp_object_kmem; +#define opd_pre_lock opd_pre->osp_pre_lock +#define opd_pre_used_fid opd_pre->osp_pre_used_fid +#define opd_pre_last_created_fid opd_pre->osp_pre_last_created_fid +#define opd_pre_reserved opd_pre->osp_pre_reserved +#define opd_pre_user_waitq opd_pre->osp_pre_user_waitq +#define opd_pre_status opd_pre->osp_pre_status +#define opd_pre_grow_count opd_pre->osp_pre_grow_count +#define opd_pre_min_grow_count opd_pre->osp_pre_min_grow_count +#define opd_pre_max_grow_count opd_pre->osp_pre_max_grow_count +#define opd_pre_grow_slow opd_pre->osp_pre_grow_slow +#define opd_pre_recovering opd_pre->osp_pre_recovering + +extern struct kmem_cache *osp_object_kmem; /* this is a top object */ struct osp_object { struct lu_object_header opo_header; struct dt_object opo_obj; - int opo_reserved:1, + unsigned int opo_reserved:1, opo_new:1, opo_empty:1; @@ -194,7 +216,6 @@ struct osp_object { extern struct lu_object_operations osp_lu_obj_ops; extern const struct dt_device_operations osp_dt_ops; extern struct dt_object_operations osp_md_obj_ops; -extern struct dt_lock_operations osp_md_lock_ops; struct osp_thread_info { struct lu_buf osi_lb; @@ -321,6 +342,11 @@ static inline struct dt_object *osp_object_child(struct osp_object *o) struct dt_object, do_lu); } +static inline struct seq_server_site *osp_seq_site(struct osp_device *osp) +{ + return osp->opd_dt_dev.dd_lu_dev.ld_site->ld_seq_site; +} + #define osp_init_rpc_lock(lck) mdc_init_rpc_lock(lck) #define osp_get_rpc_lock(lck, it) mdc_get_rpc_lock(lck, it) #define osp_put_rpc_lock(lck, it) mdc_put_rpc_lock(lck, it) @@ -350,8 +376,8 @@ static int osp_fid_end_seq(const struct lu_env *env, struct lu_fid *fid) struct osp_thread_info *info = osp_env_info(env); struct ost_id *oi = &info->osi_oi; - fid_ostid_pack(fid, oi); - return oi->oi_id == IDIF_MAX_OID; + fid_to_ostid(fid, oi); + return ostid_id(oi) == IDIF_MAX_OID; } else { return fid_oid(fid) == LUSTRE_DATA_SEQ_MAX_WIDTH; } @@ -404,6 +430,7 @@ void osp_statfs_need_now(struct osp_device *d); int osp_reset_last_used(const struct lu_env *env, struct osp_device *osp); int osp_write_last_oid_seq_files(struct lu_env *env, struct osp_device *osp, struct lu_fid *fid, int sync); +int osp_init_pre_fid(struct osp_device *osp); /* lproc_osp.c */ void lprocfs_osp_init_vars(struct lprocfs_static_vars *lvars);