X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flod%2Flod_internal.h;h=af1457cbc5c218c362aeb57354273c42aeab0915;hb=47cde804ddc9019ff0793229030211d536d0612f;hp=6d99ad5bb63a6b7ebb00b7e3543b8aff0c422738;hpb=cdc30d39c11424404de9bab40c8e30203143fde8;p=fs%2Flustre-release.git diff --git a/lustre/lod/lod_internal.h b/lustre/lod/lod_internal.h index 6d99ad5..af1457c 100644 --- a/lustre/lod/lod_internal.h +++ b/lustre/lod/lod_internal.h @@ -129,6 +129,7 @@ struct lod_tgt_desc_idx { TGT_PTRS_PER_BLOCK]->ldi_tgt[(index) % TGT_PTRS_PER_BLOCK]) #define OST_TGT(lod, index) LTD_TGT(&lod->lod_ost_descs, index) +#define MDT_TGT(lod, index) LTD_TGT(&lod->lod_mdt_descs, index) struct lod_tgt_descs { /* list of known TGTs */ struct lod_tgt_desc_idx *ltd_tgt_idx[TGT_PTRS]; @@ -198,6 +199,25 @@ struct lod_device { #define ltd_ost ltd_tgt #define lod_ost_desc lod_tgt_desc +#define lod_mdts lod_mdt_descs.ltd_tgts +#define lod_mdt_bitmap lod_mdt_descs.ltd_tgt_bitmap +#define lod_remote_mdt_count lod_mdt_descs.ltd_tgtnr +#define lod_mdts_size lod_mdt_descs.ltd_tgts_size +#define ltd_mdt ltd_tgt +#define lod_mdt_desc lod_tgt_desc + +struct lod_dir_stripe_info { + __u32 ldsi_stripe_offset; + __u32 ldsi_def_stripenr; + __u32 ldsi_def_stripe_offset; + __u32 ldsi_def_hash_type; + __u32 ldsi_hash_type; + + unsigned int ldsi_striping_cached:1, + ldsi_def_striping_set:1, + ldsi_striped:1; +}; + /* * XXX: shrink this structure, currently it's 72bytes on 32bit arch, * so, slab will be allocating 128bytes @@ -206,6 +226,7 @@ struct lod_object { struct dt_object ldo_obj; /* if object is striped, then the next fields describe stripes */ + /* For striped directory, ldo_stripenr == slave stripe count */ __u16 ldo_stripenr; __u16 ldo_layout_gen; __u32 ldo_stripe_size; @@ -218,16 +239,30 @@ struct lod_object { * is cached in stripenr/stripe_size */ unsigned int ldo_stripes_allocated:16, ldo_striping_cached:1, - ldo_def_striping_set:1; + ldo_def_striping_set:1, + /* ldo_dir_slave_stripe indicate this is a slave stripe of + * a striped dir */ + ldo_dir_slave_stripe:1; __u32 ldo_def_stripe_size; __u16 ldo_def_stripenr; __u16 ldo_def_stripe_offset; - mdsno_t ldo_mds_num; + struct lod_dir_stripe_info *ldo_dir_stripe; }; +#define ldo_dir_stripe_offset ldo_dir_stripe->ldsi_stripe_offset +#define ldo_dir_def_stripenr ldo_dir_stripe->ldsi_def_stripenr +#define ldo_dir_hash_type ldo_dir_stripe->ldsi_hash_type +#define ldo_dir_def_hash_type ldo_dir_stripe->ldsi_def_hash_type +#define ldo_dir_striping_cached ldo_dir_stripe->ldsi_striping_cached +#define ldo_dir_striped ldo_dir_stripe->ldsi_striped +#define ldo_dir_def_striping_set ldo_dir_stripe->ldsi_def_striping_set +#define ldo_dir_def_stripe_offset ldo_dir_stripe->ldsi_def_stripe_offset struct lod_it { struct dt_object *lit_obj; /* object from the layer below */ + /* stripe offset of iteration */ + __u32 lit_stripe_index; + __u32 lit_attr; struct dt_it *lit_it; /* iterator from the layer below */ }; @@ -235,12 +270,19 @@ struct lod_thread_info { /* per-thread buffer for LOV EA */ void *lti_ea_store; int lti_ea_store_size; + /* per-thread buffer for LMV EA */ struct lu_buf lti_buf; struct ost_id lti_ostid; struct lu_fid lti_fid; struct obd_statfs lti_osfs; struct lu_attr lti_attr; struct lod_it lti_it; + struct ldlm_res_id lti_res_id; + + /* used to hold lu_dirent, NAME_MAX + sizeof(struct lu_dirent) */ + char lti_key[NAME_MAX + sizeof(struct lu_dirent)]; + + struct dt_object_format lti_format; }; extern const struct lu_device_operations lod_lu_ops; @@ -322,7 +364,7 @@ static inline struct lod_thread_info *lod_env_info(const struct lu_env *env) /* lod_dev.c */ int lod_fld_lookup(const struct lu_env *env, struct lod_device *lod, - const struct lu_fid *fid, mdsno_t *tgt, int flags); + const struct lu_fid *fid, __u32 *tgt, int *flags); /* lod_lov.c */ void lod_getref(struct lod_tgt_descs *ltd); void lod_putref(struct lod_device *lod, struct lod_tgt_descs *ltd); @@ -334,8 +376,29 @@ int lod_del_device(const struct lu_env *env, struct lod_device *lod, unsigned gen, bool for_ost); int lod_fini_tgt(const struct lu_env *env, struct lod_device *lod, struct lod_tgt_descs *ltd, bool for_ost); -int lod_load_striping(const struct lu_env *env, struct lod_object *mo); -int lod_get_lov_ea(const struct lu_env *env, struct lod_object *mo); +int lod_load_striping_locked(const struct lu_env *env, struct lod_object *lo); +int lod_load_striping(const struct lu_env *env, struct lod_object *lo); + +int lod_get_ea(const struct lu_env *env, struct lod_object *lo, + const char *name); +static inline int +lod_get_lov_ea(const struct lu_env *env, struct lod_object *lo) +{ + return lod_get_ea(env, lo, XATTR_NAME_LOV); +} + +static inline int +lod_get_lmv_ea(const struct lu_env *env, struct lod_object *lo) +{ + return lod_get_ea(env, lo, XATTR_NAME_LMV); +} + +static inline int +lod_get_default_lmv_ea(const struct lu_env *env, struct lod_object *lo) +{ + return lod_get_ea(env, lo, XATTR_NAME_DEFAULT_LMV); +} + void lod_fix_desc(struct lov_desc *desc); void lod_fix_desc_qos_maxage(__u32 *val); void lod_fix_desc_pattern(__u32 *val); @@ -345,14 +408,17 @@ int lod_pools_init(struct lod_device *m, struct lustre_cfg *cfg); int lod_pools_fini(struct lod_device *m); int lod_parse_striping(const struct lu_env *env, struct lod_object *mo, const struct lu_buf *buf); +int lod_parse_dir_striping(const struct lu_env *env, struct lod_object *lo, + const struct lu_buf *buf); int lod_initialize_objects(const struct lu_env *env, struct lod_object *mo, struct lov_ost_data_v1 *objs); int lod_store_def_striping(const struct lu_env *env, struct dt_object *dt, struct thandle *th); -int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf, int specific); +int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf, + bool is_from_disk); int lod_generate_and_set_lovea(const struct lu_env *env, struct lod_object *mo, struct thandle *th); - +int lod_ea_store_resize(struct lod_thread_info *info, int size); /* lod_pool.c */ int lod_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count); int lod_ost_pool_remove(struct ost_pool *op, __u32 idx); @@ -376,7 +442,6 @@ int qos_add_tgt(struct lod_device*, struct lod_tgt_desc *); int qos_del_tgt(struct lod_device *, struct lod_tgt_desc *); /* lproc_lod.c */ -void lprocfs_lod_init_vars(struct lprocfs_static_vars *lvars); int lod_procfs_init(struct lod_device *lod); void lod_procfs_fini(struct lod_device *lod);