X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fmd_object.h;h=7cf4c68ca21140d0264dbdd6b5b3be89626b611d;hb=78fc98c662e5a7d98663f318077d621448070070;hp=8832552ca98e00a8a01a4d53d30ab6ad996da3b0;hpb=2c74bfcb7a06addb42e79c1f561afb0acfaaa7d0;p=fs%2Flustre-release.git diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h index 8832552..7cf4c68 100644 --- a/lustre/include/md_object.h +++ b/lustre/include/md_object.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * 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. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -56,9 +56,13 @@ /* * super-class definitions. */ -#include +#include #include +/* LU-1051, temperary solution to reduce llog credits */ +#define DECLARE_LLOG_REWRITE 0 +#define DECLARE_LLOG_WRITE INT_MAX + struct md_device; struct md_device_operations; struct md_object; @@ -84,7 +88,7 @@ struct md_ucred { __u32 mu_suppgids[2]; cfs_cap_t mu_cap; __u32 mu_umask; - struct group_info *mu_ginfo; + cfs_group_info_t *mu_ginfo; struct md_identity *mu_identity; }; @@ -97,10 +101,14 @@ enum { struct md_capainfo { __u32 mc_auth; __u32 mc_padding; - const struct lu_fid *mc_fid[MD_CAPAINFO_MAX]; + struct lu_fid mc_fid[MD_CAPAINFO_MAX]; struct lustre_capa *mc_capa[MD_CAPAINFO_MAX]; }; +struct md_quota { + struct obd_export *mq_exp; +}; + /** * Implemented in mdd/mdd_handler.c. * @@ -109,6 +117,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 +127,11 @@ 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), + MA_LAY_GEN = (1 << 7), + MA_HSM = (1 << 8), + MA_SOM = (1 << 9), + MA_PFID = (1 << 10) }; typedef enum { @@ -139,20 +152,39 @@ typedef enum { MDT_PDO_LOCK = (1 << 1) } mdl_type_t; +struct md_hsm { + __u32 mh_flags; + __u32 mh_archive_number; +}; + +#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; __u64 ma_attr_flags; struct lu_attr ma_attr; + struct lu_fid ma_pfid; + struct md_hsm ma_hsm; struct lov_mds_md *ma_lmm; - int ma_lmm_size; struct lmv_stripe_md *ma_lmv; - int ma_lmv_size; void *ma_acl; - int ma_acl_size; struct llog_cookie *ma_cookie; - int ma_cookie_size; struct lustre_capa *ma_capa; + struct md_som_data *ma_som; + int ma_lmm_size; + int ma_big_lmm_used:1; + int ma_lmv_size; + int ma_acl_size; + int ma_cookie_size; + __u16 ma_layout_gen; }; /** Additional parameters for create */ @@ -174,7 +206,7 @@ struct md_op_spec { int no_create; /** Create flag from client: such as MDS_OPEN_CREAT, and others. */ - __u32 sp_cr_flags; + __u64 sp_cr_flags; /** Should mdd do lookup sanity check or not. */ int sp_cr_lookup; @@ -216,12 +248,15 @@ struct md_object_operations { int (*moo_xattr_del)(const struct lu_env *env, struct md_object *obj, const char *name); + /** \retval number of bytes actually read upon success */ int (*moo_readpage)(const struct lu_env *env, struct md_object *obj, const struct lu_rdpg *rdpg); int (*moo_readlink)(const struct lu_env *env, struct md_object *obj, struct lu_buf *buf); - + int (*moo_changelog)(const struct lu_env *env, + enum changelog_rec_type type, int flags, + struct md_object *obj); /** part of cross-ref operation */ int (*moo_object_create)(const struct lu_env *env, struct md_object *obj, @@ -240,15 +275,20 @@ struct md_object_operations { struct md_object *obj, int flag); int (*moo_close)(const struct lu_env *env, struct md_object *obj, - struct md_attr *ma); + struct md_attr *ma, int mode); 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 *); - int (*moo_path)(const struct lu_env *env, struct md_object *obj, char *path, int pathlen, __u64 *recno, int *linkno); + int (*moo_file_lock)(const struct lu_env *env, struct md_object *obj, + struct lov_mds_md *lmm, struct ldlm_extent *extent, + struct lustre_handle *lockh); + int (*moo_file_unlock)(const struct lu_env *env, struct md_object *obj, + struct lov_mds_md *lmm, + struct lustre_handle *lockh); }; /** @@ -290,6 +330,13 @@ struct md_dir_operations { struct md_object *cobj, const struct lu_name *lname, struct md_attr *ma); + /** This method is used to compare a requested layout to an existing + * layout (struct lov_mds_md_v1/3 vs struct lov_mds_md_v1/3) */ + int (*mdo_lum_lmm_cmp)(const struct lu_env *env, + struct md_object *cobj, + const struct md_op_spec *spec, + struct md_attr *ma); + /** partial ops for cross-ref case */ int (*mdo_name_insert)(const struct lu_env *env, struct md_object *obj, @@ -316,7 +363,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); + struct obd_statfs *sfs); int (*mdo_init_capa_ctxt)(const struct lu_env *env, struct md_device *m, int mode, unsigned long timeout, __u32 alg, @@ -349,7 +396,6 @@ 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, @@ -408,22 +454,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 { @@ -434,37 +482,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; } @@ -478,7 +527,7 @@ struct md_object { * md-server site. */ struct md_site { - struct lu_site ms_lu; + struct lu_site *ms_lu; /** * mds number of this site. */ @@ -541,7 +590,7 @@ static inline struct md_device *md_obj2dev(const struct md_object *o) static inline struct md_site *lu_site2md(const struct lu_site *s) { - return container_of0(s, struct md_site, ms_lu); + return s->ld_md_site; } static inline int md_device_init(struct md_device *md, struct lu_device_type *t) @@ -589,6 +638,14 @@ static inline int mo_readlink(const struct lu_env *env, return m->mo_ops->moo_readlink(env, m, buf); } +static inline int mo_changelog(const struct lu_env *env, + enum changelog_rec_type type, + int flags, struct md_object *m) +{ + LASSERT(m->mo_ops->moo_changelog); + return m->mo_ops->moo_changelog(env, type, flags, m); +} + static inline int mo_attr_set(const struct lu_env *env, struct md_object *m, const struct md_attr *at) @@ -642,10 +699,11 @@ static inline int mo_open(const struct lu_env *env, static inline int mo_close(const struct lu_env *env, struct md_object *m, - struct md_attr *ma) + struct md_attr *ma, + int mode) { LASSERT(m->mo_ops->moo_close); - return m->mo_ops->moo_close(env, m, ma); + return m->mo_ops->moo_close(env, m, ma, mode); } static inline int mo_readpage(const struct lu_env *env, @@ -704,6 +762,23 @@ static inline int mo_object_sync(const struct lu_env *env, struct md_object *m) return m->mo_ops->moo_object_sync(env, m); } +static inline int mo_file_lock(const struct lu_env *env, struct md_object *m, + struct lov_mds_md *lmm, + struct ldlm_extent *extent, + struct lustre_handle *lockh) +{ + LASSERT(m->mo_ops->moo_file_lock); + return m->mo_ops->moo_file_lock(env, m, lmm, extent, lockh); +} + +static inline int mo_file_unlock(const struct lu_env *env, struct md_object *m, + struct lov_mds_md *lmm, + struct lustre_handle *lockh) +{ + LASSERT(m->mo_ops->moo_file_unlock); + return m->mo_ops->moo_file_unlock(env, m, lmm, lockh); +} + static inline int mdo_lookup(const struct lu_env *env, struct md_object *p, const struct lu_name *lname, @@ -730,8 +805,8 @@ static inline int mdo_create(const struct lu_env *env, struct md_op_spec *spc, struct md_attr *at) { - LASSERT(c->mo_dir_ops->mdo_create); - return c->mo_dir_ops->mdo_create(env, p, lchild_name, c, spc, at); + LASSERT(p->mo_dir_ops->mdo_create); + return p->mo_dir_ops->mdo_create(env, p, lchild_name, c, spc, at); } static inline int mdo_create_data(const struct lu_env *env, @@ -787,6 +862,15 @@ static inline int mdo_unlink(const struct lu_env *env, return c->mo_dir_ops->mdo_unlink(env, p, c, lname, ma); } +static inline int mdo_lum_lmm_cmp(const struct lu_env *env, + struct md_object *c, + const struct md_op_spec *spec, + struct md_attr *ma) +{ + LASSERT(c->mo_dir_ops->mdo_lum_lmm_cmp); + return c->mo_dir_ops->mdo_lum_lmm_cmp(env, c, spec, ma); +} + static inline int mdo_name_insert(const struct lu_env *env, struct md_object *p, const struct lu_name *lname, @@ -832,8 +916,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,