X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fmd_object.h;h=df6d505d55e3f3e397afd3598138de04c7fb2e37;hb=7d2a94e40959a63d97ca4adc9a5d7a33511faa55;hp=718e3369b453ffe7381c1e8a179275a2daa156f7;hpb=65224bacf78ff7fdb8502bb1c2655223f6a1bb44;p=fs%2Flustre-release.git diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h index 718e336..df6d505 100644 --- a/lustre/include/md_object.h +++ b/lustre/include/md_object.h @@ -56,7 +56,7 @@ /* * super-class definitions. */ -#include +#include #include struct md_device; @@ -84,8 +84,8 @@ struct md_ucred { __u32 mu_suppgids[2]; cfs_cap_t mu_cap; __u32 mu_umask; - struct group_info *mu_ginfo; - struct md_identity *mu_identity; + cfs_group_info_t *mu_ginfo; + struct md_identity *mu_identity; }; enum { @@ -101,6 +101,10 @@ struct md_capainfo { struct lustre_capa *mc_capa[MD_CAPAINFO_MAX]; }; +struct md_quota { + struct obd_export *mq_exp; +}; + /** * Implemented in mdd/mdd_handler.c. * @@ -109,6 +113,7 @@ struct md_capainfo { */ struct md_ucred *md_ucred(const struct lu_env *env); struct md_capainfo *md_capainfo(const struct lu_env *env); +struct md_quota *md_quota(const struct lu_env *env); /** metadata attributes */ enum ma_valid { @@ -118,7 +123,10 @@ enum ma_valid { MA_FLAGS = (1 << 3), MA_LMV = (1 << 4), MA_ACL_DEF = (1 << 5), - MA_LOV_DEF = (1 << 6) + MA_LOV_DEF = (1 << 6), +/* (Layout lock will used #7 here) */ + MA_HSM = (1 << 8), + MA_SOM = (1 << 9) }; typedef enum { @@ -139,6 +147,21 @@ typedef enum { MDT_PDO_LOCK = (1 << 1) } mdl_type_t; +struct md_hsm { + __u32 mh_flags; +}; +#define ma_hsm_flags ma_hsm.mh_flags +#define HSM_FLAGS_MASK 0 + +#define IOEPOCH_INVAL 0 + +struct md_som_data { + __u64 msd_ioepoch; + __u64 msd_size; + __u64 msd_blocks; + __u64 msd_mountid; +}; + struct md_attr { __u64 ma_valid; __u64 ma_need; @@ -153,6 +176,8 @@ struct md_attr { struct llog_cookie *ma_cookie; int ma_cookie_size; struct lustre_capa *ma_capa; + struct md_hsm ma_hsm; + struct md_som_data *ma_som; }; /** Additional parameters for create */ @@ -244,7 +269,14 @@ struct md_object_operations { int (*moo_capa_get)(const struct lu_env *, struct md_object *, struct lustre_capa *, int renewal); + int (*moo_object_sync)(const struct lu_env *, struct md_object *); + dt_obj_version_t (*moo_version_get)(const struct lu_env *, + struct md_object *); + void (*moo_version_set)(const struct lu_env *, struct md_object *, + dt_obj_version_t); + int (*moo_path)(const struct lu_env *env, struct md_object *obj, + char *path, int pathlen, __u64 *recno, int *linkno); }; /** @@ -312,7 +344,7 @@ struct md_device_operations { int *md_size, int *cookie_size); int (*mdo_statfs)(const struct lu_env *env, struct md_device *m, - struct kstatfs *sfs); + cfs_kstatfs_t *sfs); int (*mdo_init_capa_ctxt)(const struct lu_env *env, struct md_device *m, int mode, unsigned long timeout, __u32 alg, @@ -322,6 +354,12 @@ struct md_device_operations { struct md_device *m, struct lustre_capa_key *key); + int (*mdo_llog_ctxt_get)(const struct lu_env *env, + struct md_device *m, int idx, void **h); + + int (*mdo_iocontrol)(const struct lu_env *env, struct md_device *m, + unsigned int cmd, int len, void *data); + #ifdef HAVE_QUOTA_SUPPORT struct md_quota_operations { int (*mqo_notify)(const struct lu_env *env, @@ -339,18 +377,15 @@ struct md_device_operations { int (*mqo_check)(const struct lu_env *env, struct md_device *m, - struct obd_export *exp, __u32 type); int (*mqo_on)(const struct lu_env *env, struct md_device *m, - __u32 type, - __u32 id); + __u32 type); int (*mqo_off)(const struct lu_env *env, struct md_device *m, - __u32 type, - __u32 id); + __u32 type); int (*mqo_setinfo)(const struct lu_env *env, struct md_device *m, @@ -400,22 +435,24 @@ struct md_device_operations { }; enum md_upcall_event { - /**sync the md layer*/ + /** Sync the md layer*/ MD_LOV_SYNC = (1 << 0), /** Just for split, no need trans, for replay */ MD_NO_TRANS = (1 << 1), - MD_LOV_CONFIG = (1 << 2) + MD_LOV_CONFIG = (1 << 2), + /** Trigger quota recovery */ + MD_LOV_QUOTA = (1 << 3) }; struct md_upcall { /** this lock protects upcall using against its removal * read lock is for usage the upcall, write - for init/fini */ - struct rw_semaphore mu_upcall_sem; + cfs_rw_semaphore_t mu_upcall_sem; /** device to call, upper layer normally */ struct md_device *mu_upcall_dev; /** upcall function */ int (*mu_upcall)(const struct lu_env *env, struct md_device *md, - enum md_upcall_event ev); + enum md_upcall_event ev, void *data); }; struct md_device { @@ -426,37 +463,38 @@ struct md_device { static inline void md_upcall_init(struct md_device *m, void *upcl) { - init_rwsem(&m->md_upcall.mu_upcall_sem); + cfs_init_rwsem(&m->md_upcall.mu_upcall_sem); m->md_upcall.mu_upcall_dev = NULL; m->md_upcall.mu_upcall = upcl; } static inline void md_upcall_dev_set(struct md_device *m, struct md_device *up) { - down_write(&m->md_upcall.mu_upcall_sem); + cfs_down_write(&m->md_upcall.mu_upcall_sem); m->md_upcall.mu_upcall_dev = up; - up_write(&m->md_upcall.mu_upcall_sem); + cfs_up_write(&m->md_upcall.mu_upcall_sem); } static inline void md_upcall_fini(struct md_device *m) { - down_write(&m->md_upcall.mu_upcall_sem); + cfs_down_write(&m->md_upcall.mu_upcall_sem); m->md_upcall.mu_upcall_dev = NULL; m->md_upcall.mu_upcall = NULL; - up_write(&m->md_upcall.mu_upcall_sem); + cfs_up_write(&m->md_upcall.mu_upcall_sem); } static inline int md_do_upcall(const struct lu_env *env, struct md_device *m, - enum md_upcall_event ev) + enum md_upcall_event ev, void *data) { int rc = 0; - down_read(&m->md_upcall.mu_upcall_sem); + cfs_down_read(&m->md_upcall.mu_upcall_sem); if (m->md_upcall.mu_upcall_dev != NULL && m->md_upcall.mu_upcall_dev->md_upcall.mu_upcall != NULL) { rc = m->md_upcall.mu_upcall_dev->md_upcall.mu_upcall(env, - m->md_upcall.mu_upcall_dev, ev); + m->md_upcall.mu_upcall_dev, + ev, data); } - up_read(&m->md_upcall.mu_upcall_sem); + cfs_up_read(&m->md_upcall.mu_upcall_sem); return rc; } @@ -682,12 +720,34 @@ static inline int mo_capa_get(const struct lu_env *env, return m->mo_ops->moo_capa_get(env, m, c, renewal); } +static inline int mo_path(const struct lu_env *env, struct md_object *m, + char *path, int pathlen, __u64 *recno, int *linkno) +{ + if (m->mo_ops->moo_path == NULL) + return -ENOSYS; + return m->mo_ops->moo_path(env, m, path, pathlen, recno, linkno); +} + static inline int mo_object_sync(const struct lu_env *env, struct md_object *m) { LASSERT(m->mo_ops->moo_object_sync); return m->mo_ops->moo_object_sync(env, m); } +static inline dt_obj_version_t mo_version_get(const struct lu_env *env, + struct md_object *m) +{ + LASSERT(m->mo_ops->moo_version_get); + return m->mo_ops->moo_version_get(env, m); +} + +static inline void mo_version_set(const struct lu_env *env, + struct md_object *m, dt_obj_version_t ver) +{ + LASSERT(m->mo_ops->moo_version_set); + return m->mo_ops->moo_version_set(env, m, ver); +} + static inline int mdo_lookup(const struct lu_env *env, struct md_object *p, const struct lu_name *lname, @@ -816,8 +876,8 @@ struct lu_local_obj_desc { const char *llod_name; __u32 llod_oid; int llod_is_index; - const struct dt_index_features * llod_feat; - struct list_head llod_linkage; + const struct dt_index_features *llod_feat; + cfs_list_t llod_linkage; }; struct md_object *llo_store_resolve(const struct lu_env *env,