X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_internal.h;h=9183bbaccc50ce4fd83d6603a8dce16095e23905;hb=b69b7de30c3977cb69a741099218bc4a81752717;hp=8d8f4d8bba89f7853b96c772ae75f1e2d6437974;hpb=3d6a1b79c92933f8d822919229016fbb0122b769;p=fs%2Flustre-release.git diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h index 8d8f4d8..9183bba 100644 --- a/lustre/mdd/mdd_internal.h +++ b/lustre/mdd/mdd_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) 2011, 2012, Intel Corporation. + * Copyright (c) 2011, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -45,18 +45,12 @@ #include #include #include -#include -#include +#include #include #include #include #include - -#include "mdd_lfsck.h" - -/* PDO lock is unnecessary for current MDT stack because operations - * are already protected by ldlm lock */ -#define MDD_DISABLE_PDO_LOCK 1 +#include /* Changelog flags */ /** changelog is recording */ @@ -90,38 +84,44 @@ static inline __u64 cl_time(void) { /** Objects in .lustre dir */ struct mdd_dot_lustre_objs { - struct mdd_object *mdd_obf; + struct mdd_object *mdd_obf; + struct mdd_object *mdd_lpf; }; -extern const char lfsck_bookmark_name[]; -extern const char lfsck_namespace_name[]; +struct mdd_generic_thread { + struct completion mgt_started; + struct completion mgt_finished; + void *mgt_data; + bool mgt_abort; + bool mgt_init; +}; struct mdd_device { struct md_device mdd_md_dev; struct obd_export *mdd_child_exp; struct dt_device *mdd_child; struct dt_device *mdd_bottom; - struct lu_fid mdd_root_fid; + struct lu_fid mdd_root_fid; /* /ROOT */ struct lu_fid mdd_local_root_fid; struct dt_device_param mdd_dt_conf; struct dt_object *mdd_orphans; /* PENDING directory */ - struct dt_object *mdd_capa; cfs_proc_dir_entry_t *mdd_proc_entry; struct mdd_changelog mdd_cl; unsigned long mdd_atime_diff; struct mdd_object *mdd_dot_lustre; struct mdd_dot_lustre_objs mdd_dot_lustre_objs; - struct md_lfsck mdd_lfsck; unsigned int mdd_sync_permission; int mdd_connects; + struct local_oid_storage *mdd_los; + struct mdd_generic_thread mdd_orph_cleanup_thread; }; enum mod_flags { - /* The dir object has been unlinked */ - DEAD_OBJ = 1 << 0, - APPEND_OBJ = 1 << 1, - IMMUTE_OBJ = 1 << 2, - ORPHAN_OBJ = 1 << 3, + /* The dir object has been unlinked */ + DEAD_OBJ = 1 << 0, + APPEND_OBJ = 1 << 1, + IMMUTE_OBJ = 1 << 2, + ORPHAN_OBJ = 1 << 3, }; struct mdd_object { @@ -131,141 +131,60 @@ struct mdd_object { __u32 mod_valid; __u64 mod_cltime; unsigned long mod_flags; -#ifndef MDD_DISABLE_PDO_LOCK - struct dynlock mod_pdlock; -#endif -#ifdef CONFIG_LOCKDEP - /* "dep_map" name is assumed by lockdep.h macros. */ - struct lockdep_map dep_map; -#endif }; struct mdd_thread_info { - struct lu_fid mti_fid; - struct lu_fid mti_fid2; /* used for be & cpu converting */ - struct lu_attr mti_la; - struct lu_attr mti_la_for_fix; + struct lu_fid mti_fid; + struct lu_fid mti_fid2; /* used for be & cpu converting */ + /** + * only be used by MDD interfaces, can be passed into local MDD APIs. + */ struct lu_attr mti_pattr; struct lu_attr mti_cattr; - struct md_attr mti_ma; - struct obd_info mti_oi; + struct lu_attr mti_tpattr; + struct lu_attr mti_tattr; + /** used to set c/mtime */ + struct lu_attr mti_la_for_fix; + /* Only used in mdd_object_start */ + struct lu_attr mti_la_for_start; /* mti_ent and mti_key must be conjoint, - * then mti_ent::lde_name will be mti_key. */ + * then mti_ent::lde_name will be mti_key. */ struct lu_dirent mti_ent; char mti_key[NAME_MAX + 16]; - struct obd_trans_info mti_oti; - struct lu_buf mti_buf; - struct lu_buf mti_big_buf; /* biggish persistent buf */ - struct lu_name mti_name; - struct lu_name mti_name2; - struct obdo mti_oa; - char mti_xattr_buf[LUSTRE_POSIX_ACL_MAX_SIZE]; - struct dt_allocation_hint mti_hint; - struct lov_mds_md *mti_max_lmm; - int mti_max_lmm_size; - struct llog_cookie *mti_max_cookie; - int mti_max_cookie_size; - struct dt_object_format mti_dof; - struct obd_quotactl mti_oqctl; -}; - -/** - * The data that link search is done on. - */ -struct mdd_link_data { - /** - * Buffer to keep link EA body. - */ - struct lu_buf *ml_buf; - /** - * The matched header, entry and its lenght in the EA - */ - struct link_ea_header *ml_leh; - struct link_ea_entry *ml_lee; - int ml_reclen; + struct lu_buf mti_buf[4]; + struct lu_buf mti_big_buf; /* biggish persistent buf */ + struct lu_buf mti_link_buf; /* buf for link ea */ + struct obdo mti_oa; + char mti_xattr_buf[LUSTRE_POSIX_ACL_MAX_SIZE]; + struct dt_allocation_hint mti_hint; + struct dt_object_format mti_dof; + struct linkea_data mti_link_data; + struct md_op_spec mti_spec; + struct dt_insert_rec mti_dt_rec; }; extern const char orph_index_name[]; -extern const struct dt_index_features orph_index_features; - -struct lov_mds_md *mdd_max_lmm_buffer(const struct lu_env *env, int size); -struct lov_mds_md *mdd_max_lmm_get(const struct lu_env *env, - struct mdd_device *mdd); - -struct llog_cookie *mdd_max_cookie_get(const struct lu_env *env, - struct mdd_device *mdd); - -int mdd_init_obd(const struct lu_env *env, struct mdd_device *mdd, - struct lustre_cfg *cfg); -int mdd_fini_obd(const struct lu_env *env, struct mdd_device *mdd, - struct lustre_cfg *lcfg); -int __mdd_xattr_set(const struct lu_env *env, struct mdd_object *obj, - const struct lu_buf *buf, const char *name, - int fl, struct thandle *handle); -int mdd_xattr_set_txn(const struct lu_env *env, struct mdd_object *obj, - const struct lu_buf *buf, const char *name, int fl, - struct thandle *txn); -int mdd_lsm_sanity_check(const struct lu_env *env, struct mdd_object *obj); -int mdd_lov_set_md(const struct lu_env *env, struct mdd_object *pobj, - struct mdd_object *child, struct lov_mds_md *lmm, - int lmm_size, struct thandle *handle, int set_stripe); -int mdd_lov_create(const struct lu_env *env, struct mdd_device *mdd, - struct mdd_object *parent, struct mdd_object *child, - struct lov_mds_md **lmm, int *lmm_size, - const struct md_op_spec *spec, struct md_attr *ma); -int mdd_lov_objid_prepare(struct mdd_device *mdd, struct lov_mds_md *lmm); -int mdd_declare_lov_objid_update(const struct lu_env *, struct mdd_device *, - struct thandle *); -void mdd_lov_objid_update(struct mdd_device *mdd, struct lov_mds_md *lmm); -void mdd_lov_create_finish(const struct lu_env *env, struct mdd_device *mdd, - struct lov_mds_md *lmm, int lmm_size, - const struct md_op_spec *spec); -int mdd_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 mdd_file_unlock(const struct lu_env *env, struct md_object *obj, - struct lov_mds_md *lmm, struct lustre_handle *lockh); -int mdd_lum_lmm_cmp(const struct lu_env *env, struct md_object *cobj, - const struct md_op_spec *spec, struct md_attr *ma); -int mdd_get_md(const struct lu_env *env, struct mdd_object *obj, - void *md, int *md_size, const char *name); -int mdd_get_md_locked(const struct lu_env *env, struct mdd_object *obj, - void *md, int *md_size, const char *name); -int mdd_data_get(const struct lu_env *env, struct mdd_object *obj, void **data); int mdd_la_get(const struct lu_env *env, struct mdd_object *obj, struct lu_attr *la, struct lustre_capa *capa); +void mdd_flags_xlate(struct mdd_object *obj, __u32 flags); int mdd_attr_get(const struct lu_env *env, struct md_object *obj, struct md_attr *ma); int mdd_attr_set(const struct lu_env *env, struct md_object *obj, const struct md_attr *ma); int mdd_attr_set_internal(const struct lu_env *env, - struct mdd_object *obj, - struct lu_attr *attr, - struct thandle *handle, - int needacl); -int mdd_attr_check_set_internal(const struct lu_env *env, - struct mdd_object *obj, - struct lu_attr *attr, - struct thandle *handle, - int needacl); -int mdd_declare_object_kill(const struct lu_env *env, struct mdd_object *obj, - struct md_attr *ma, struct thandle *handle); -int mdd_object_kill(const struct lu_env *env, struct mdd_object *obj, - struct md_attr *ma, struct thandle *handle); -int mdd_iattr_get(const struct lu_env *env, struct mdd_object *mdd_obj, - struct md_attr *ma); + struct mdd_object *obj, + const struct lu_attr *attr, + struct thandle *handle, + int needacl); +int mdd_update_time(const struct lu_env *env, struct mdd_object *obj, + const struct lu_attr *oattr, struct lu_attr *attr, + struct thandle *handle); int mdd_object_create_internal(const struct lu_env *env, struct mdd_object *p, struct mdd_object *c, struct lu_attr *attr, struct thandle *handle, - const struct md_op_spec *spec); -int mdd_attr_check_set_internal_locked(const struct lu_env *env, - struct mdd_object *obj, - struct lu_attr *attr, - struct thandle *handle, - int needacl); -int mdd_lmm_get_locked(const struct lu_env *env, struct mdd_object *mdd_obj, - struct md_attr *ma); + const struct md_op_spec *spec, + struct dt_allocation_hint *hint); /* mdd_lock.c */ void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj, @@ -276,93 +195,57 @@ void mdd_write_unlock(const struct lu_env *env, struct mdd_object *obj); void mdd_read_unlock(const struct lu_env *env, struct mdd_object *obj); int mdd_write_locked(const struct lu_env *env, struct mdd_object *obj); -void mdd_pdlock_init(struct mdd_object *obj); -unsigned long mdd_name2hash(const char *name); -void *mdd_pdo_write_lock(const struct lu_env *env, struct mdd_object *obj, - const char *name, enum mdd_object_role role); -void *mdd_pdo_read_lock(const struct lu_env *env, struct mdd_object *obj, - const char *name, enum mdd_object_role role); -void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj, - void *dlh); -void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj, - void *dlh); /* mdd_dir.c */ -int mdd_parent_fid(const struct lu_env *env, struct mdd_object *obj, - struct lu_fid *fid); int mdd_is_subdir(const struct lu_env *env, struct md_object *mo, const struct lu_fid *fid, struct lu_fid *sfid); int mdd_may_create(const struct lu_env *env, struct mdd_object *pobj, - struct mdd_object *cobj, int check_perm, int check_nlink); + const struct lu_attr *pattr, struct mdd_object *cobj, + bool check_perm); int mdd_may_unlink(const struct lu_env *env, struct mdd_object *pobj, - const struct lu_attr *attr); -int mdd_may_delete(const struct lu_env *env, struct mdd_object *pobj, - struct mdd_object *cobj, struct lu_attr *cattr, - struct lu_attr *src_attr, int check_perm, int check_empty); + const struct lu_attr *pattr, const struct lu_attr *attr); +int mdd_may_delete(const struct lu_env *env, struct mdd_object *tpobj, + const struct lu_attr *tpattr, struct mdd_object *tobj, + const struct lu_attr *tattr, const struct lu_attr *cattr, + int check_perm, int check_empty); int mdd_unlink_sanity_check(const struct lu_env *env, struct mdd_object *pobj, - struct mdd_object *cobj, struct lu_attr *cattr); + const struct lu_attr *pattr, + struct mdd_object *cobj, + const struct lu_attr *cattr); int mdd_finish_unlink(const struct lu_env *env, struct mdd_object *obj, - struct md_attr *ma, struct thandle *th); -int mdd_object_initialize(const struct lu_env *env, const struct lu_fid *pfid, - const struct lu_name *lname, struct mdd_object *child, - struct lu_attr *attr, struct thandle *handle, - const struct md_op_spec *spec); -int mdd_link_sanity_check(const struct lu_env *env, struct mdd_object *tgt_obj, - const struct lu_name *lname, struct mdd_object *src_obj); + struct md_attr *ma, const struct mdd_object *pobj, + const struct lu_name *lname, struct thandle *th); + int mdd_is_root(struct mdd_device *mdd, const struct lu_fid *fid); int mdd_lookup(const struct lu_env *env, struct md_object *pobj, const struct lu_name *lname, struct lu_fid* fid, struct md_op_spec *spec); int mdd_links_read(const struct lu_env *env, struct mdd_object *mdd_obj, - struct mdd_link_data *ldata); -int mdd_links_find(const struct lu_env *env, struct mdd_object *mdd_obj, - struct mdd_link_data *ldata, const struct lu_name *lname, - const struct lu_fid *pfid); -int mdd_links_new(const struct lu_env *env, struct mdd_link_data *ldata); -int mdd_links_add_buf(const struct lu_env *env, struct mdd_link_data *ldata, - const struct lu_name *lname, const struct lu_fid *pfid); -void mdd_links_del_buf(const struct lu_env *env, struct mdd_link_data *ldata, - const struct lu_name *lname); -int mdd_declare_links_add(const struct lu_env *env, - struct mdd_object *mdd_obj, - struct thandle *handle); + struct linkea_data *ldata); +int mdd_declare_links_add(const struct lu_env *env, struct mdd_object *mdd_obj, + struct thandle *handle, struct linkea_data *ldata); int mdd_links_write(const struct lu_env *env, struct mdd_object *mdd_obj, - struct mdd_link_data *ldata, struct thandle *handle); + struct linkea_data *ldata, struct thandle *handle); struct lu_buf *mdd_links_get(const struct lu_env *env, struct mdd_object *mdd_obj); -void mdd_lee_unpack(const struct link_ea_entry *lee, int *reclen, - struct lu_name *lname, struct lu_fid *pfid); - -/* mdd_lov.c */ -int mdd_declare_unlink_log(const struct lu_env *env, struct mdd_object *obj, - struct md_attr *ma, struct thandle *handle); -int mdd_unlink_log(const struct lu_env *env, struct mdd_device *mdd, - struct mdd_object *mdd_cobj, struct md_attr *ma); - -int mdd_setattr_log(const struct lu_env *env, struct mdd_device *mdd, - const struct md_attr *ma, - struct lov_mds_md *lmm, int lmm_size, - struct llog_cookie *logcookies, int cookies_size); - -int mdd_get_cookie_size(const struct lu_env *env, struct mdd_device *mdd, - struct lov_mds_md *lmm); - -int mdd_lov_setattr_async(const struct lu_env *env, struct mdd_object *obj, - struct lov_mds_md *lmm, int lmm_size, - struct llog_cookie *logcookies); - -int mdd_lovobj_unlink(const struct lu_env *env, struct mdd_device *mdd, - struct mdd_object *obj, struct lu_attr *la, - struct md_attr *ma, int log_unlink); +int mdd_links_rename(const struct lu_env *env, + struct mdd_object *mdd_obj, + const struct lu_fid *oldpfid, + const struct lu_name *oldlname, + const struct lu_fid *newpfid, + const struct lu_name *newlname, + struct thandle *handle, + struct linkea_data *ldata, + int first, int check); struct mdd_thread_info *mdd_env_info(const struct lu_env *env); -const struct lu_name *mdd_name_get_const(const struct lu_env *env, - const void *area, ssize_t len); +#define MDD_ENV_VAR(env, var) (&mdd_env_info(env)->mti_##var) + struct lu_buf *mdd_buf_get(const struct lu_env *env, void *area, ssize_t len); const struct lu_buf *mdd_buf_get_const(const struct lu_env *env, const void *area, ssize_t len); -int __mdd_orphan_cleanup(const struct lu_env *env, struct mdd_device *d); +int mdd_orphan_cleanup(const struct lu_env *env, struct mdd_device *d); int __mdd_orphan_add(const struct lu_env *, struct mdd_object *, struct thandle *); int __mdd_orphan_del(const struct lu_env *, struct mdd_object *, @@ -370,42 +253,39 @@ int __mdd_orphan_del(const struct lu_env *, struct mdd_object *, int orph_index_init(const struct lu_env *env, struct mdd_device *mdd); void orph_index_fini(const struct lu_env *env, struct mdd_device *mdd); int orph_declare_index_insert(const struct lu_env *, struct mdd_object *, - cfs_umode_t mode, struct thandle *); + umode_t mode, struct thandle *); int orph_declare_index_delete(const struct lu_env *, struct mdd_object *, struct thandle *); /* mdd_lproc.c */ -void lprocfs_mdd_init_vars(struct lprocfs_static_vars *lvars); int mdd_procfs_init(struct mdd_device *mdd, const char *name); -int mdd_procfs_fini(struct mdd_device *mdd); +void mdd_procfs_fini(struct mdd_device *mdd); /* mdd_object.c */ -int mdd_get_flags(const struct lu_env *env, struct mdd_object *obj); -struct lu_buf *mdd_buf_alloc(const struct lu_env *env, ssize_t len); -int mdd_buf_grow(const struct lu_env *env, ssize_t len); -void mdd_buf_put(struct lu_buf *buf); - +extern struct kmem_cache *mdd_object_kmem; extern const struct md_dir_operations mdd_dir_ops; extern const struct md_object_operations mdd_obj_ops; - -int accmode(const struct lu_env *env, struct lu_attr *la, int flags); +int mdd_readlink(const struct lu_env *env, struct md_object *obj, + struct lu_buf *buf); +int accmode(const struct lu_env *env, const struct lu_attr *la, int flags); extern struct lu_context_key mdd_thread_key; extern const struct lu_device_operations mdd_lu_ops; struct mdd_object *mdd_object_find(const struct lu_env *env, struct mdd_device *d, const struct lu_fid *f); -int mdd_get_default_md(struct mdd_object *mdd_obj, struct lov_mds_md *lmm); int mdd_readpage(const struct lu_env *env, struct md_object *obj, const struct lu_rdpg *rdpg); -int mdd_declare_llog_record(const struct lu_env *env, struct mdd_device *mdd, - int reclen, struct thandle *handle); int mdd_declare_changelog_store(const struct lu_env *env, struct mdd_device *mdd, const struct lu_name *fname, struct thandle *handle); int mdd_changelog_store(const struct lu_env *env, struct mdd_device *mdd, struct llog_changelog_rec *rec, struct thandle *th); +int mdd_changelog_data_store(const struct lu_env *env, struct mdd_device *mdd, + enum changelog_rec_type type, int flags, + struct mdd_object *mdd_obj, + struct thandle *handle); int mdd_changelog_ns_store(const struct lu_env *env, struct mdd_device *mdd, enum changelog_rec_type type, unsigned flags, struct mdd_object *target, struct mdd_object *parent, @@ -415,14 +295,16 @@ int mdd_declare_object_create_internal(const struct lu_env *env, struct mdd_object *c, struct lu_attr *attr, struct thandle *handle, - const struct md_op_spec *spec); + const struct md_op_spec *spec, + struct dt_allocation_hint *hint); +int mdd_get_lov_ea(const struct lu_env *env, struct mdd_object *obj, + struct lu_buf *lmm_buf); /* mdd_trans.c */ -int mdd_lov_destroy(const struct lu_env *env, struct mdd_device *mdd, - struct mdd_object *obj, struct lu_attr *la); - void mdd_object_make_hint(const struct lu_env *env, struct mdd_object *parent, - struct mdd_object *child, struct lu_attr *attr); + struct mdd_object *child, const struct lu_attr *attr, + const struct md_op_spec *spec, + struct dt_allocation_hint *hint); static inline void mdd_object_get(struct mdd_object *o) { @@ -439,44 +321,38 @@ struct thandle *mdd_trans_create(const struct lu_env *env, struct mdd_device *mdd); int mdd_trans_start(const struct lu_env *env, struct mdd_device *mdd, struct thandle *th); -void mdd_trans_stop(const struct lu_env *env, struct mdd_device *mdd, - int rc, struct thandle *handle); -int mdd_txn_stop_cb(const struct lu_env *env, struct thandle *txn, - void *cookie); -int mdd_txn_start_cb(const struct lu_env *env, struct thandle *, - void *cookie); - -/* mdd_lfsck.c */ -int mdd_lfsck_set_speed(const struct lu_env *env, struct md_lfsck *lfsck, - __u32 limit); -int mdd_lfsck_start(const struct lu_env *env, struct md_lfsck *lfsck, - struct lfsck_start *start); -int mdd_lfsck_stop(const struct lu_env *env, struct md_lfsck *lfsck, - bool pause); -int mdd_lfsck_setup(const struct lu_env *env, struct mdd_device *mdd); -void mdd_lfsck_cleanup(const struct lu_env *env, struct mdd_device *mdd); +int mdd_trans_stop(const struct lu_env *env, struct mdd_device *mdd, + int rc, struct thandle *handle); /* mdd_device.c */ struct lu_object *mdd_object_alloc(const struct lu_env *env, const struct lu_object_header *hdr, struct lu_device *d); +int mdd_local_file_create(const struct lu_env *env, struct mdd_device *mdd, + const struct lu_fid *pfid, const char *name, + __u32 mode, struct lu_fid *fid); int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode, struct thandle *handle); -int __mdd_declare_acl_init(const struct lu_env *env, struct mdd_object *obj, - int is_dir, struct thandle *handle); int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj, - const struct lu_buf *buf, int fl); -int __mdd_acl_init(const struct lu_env *env, struct mdd_object *obj, - struct lu_buf *buf, __u32 *mode, struct thandle *handle); + struct lu_attr *attr, const struct lu_buf *buf, int fl); +int __mdd_fix_mode_acl(const struct lu_env *env, struct lu_buf *buf, + __u32 *mode); int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj, - struct lu_attr *la, int mask, int role); + const struct lu_attr *la, int mask, int role); int mdd_permission(const struct lu_env *env, struct md_object *pobj, struct md_object *cobj, struct md_attr *ma, int mask); int mdd_capa_get(const struct lu_env *env, struct md_object *obj, struct lustre_capa *capa, int renewal); +int mdd_generic_thread_start(struct mdd_generic_thread *thread, + int (*func)(void *), void *data, char *name); +void mdd_generic_thread_stop(struct mdd_generic_thread *thread); + +/* mdd_prepare.c */ +int mdd_compat_fixes(const struct lu_env *env, struct mdd_device *mdd); +/* inline functions */ static inline int lu_device_is_mdd(struct lu_device *d) { return ergo(d != NULL && d->ld_ops != NULL, d->ld_ops == &mdd_lu_ops); @@ -541,12 +417,7 @@ static inline const struct lu_fid *mdo2fid(const struct mdd_object *obj) return lu_object_fid(&obj->mod_obj.mo_lu); } -static inline int mdd_object_obf(const struct mdd_object *obj) -{ - return lu_fid_eq(mdo2fid(obj), &LU_OBF_FID); -} - -static inline cfs_umode_t mdd_object_type(const struct mdd_object *obj) +static inline umode_t mdd_object_type(const struct mdd_object *obj) { return lu_object_attr(&obj->mod_obj.mo_lu); } @@ -581,35 +452,42 @@ static inline const struct lu_fid *mdd_object_fid(struct mdd_object *obj) return lu_object_fid(mdd2lu_obj(obj)); } +static inline struct seq_server_site *mdd_seq_site(struct mdd_device *mdd) +{ + return mdd2lu_dev(mdd)->ld_site->ld_seq_site; +} + static inline struct lustre_capa *mdd_object_capa(const struct lu_env *env, - const struct mdd_object *obj) + const struct mdd_object *obj) { - struct md_capainfo *ci = md_capainfo(env); - const struct lu_fid *fid = mdo2fid(obj); - int i; + struct lu_capainfo *lci = lu_capainfo_get(env); + const struct lu_fid *fid = mdo2fid(obj); + int i; + + /* NB: in mdt_init0 */ + if (lci == NULL) + return BYPASS_CAPA; - /* NB: in mdt_init0 */ - if (!ci) - return BYPASS_CAPA; - for (i = 0; i < MD_CAPAINFO_MAX; i++) - if (lu_fid_eq(&ci->mc_fid[i], fid)) - return ci->mc_capa[i]; - return NULL; + for (i = 0; i < LU_CAPAINFO_MAX; i++) + if (lu_fid_eq(&lci->lci_fid[i], fid)) + return lci->lci_capa[i]; + return NULL; } static inline void mdd_set_capainfo(const struct lu_env *env, int offset, - const struct mdd_object *obj, - struct lustre_capa *capa) + const struct mdd_object *obj, + struct lustre_capa *capa) { - struct md_capainfo *ci = md_capainfo(env); - const struct lu_fid *fid = mdo2fid(obj); + struct lu_capainfo *lci = lu_capainfo_get(env); + const struct lu_fid *fid = mdo2fid(obj); - LASSERT(offset >= 0 && offset < MD_CAPAINFO_MAX); - /* NB: in mdt_init0 */ - if (!ci) - return; - ci->mc_fid[offset] = *fid; - ci->mc_capa[offset] = capa; + LASSERT(offset >= 0 && offset < LU_CAPAINFO_MAX); + /* NB: in mdt_init0 */ + if (lci == NULL) + return; + + lci->lci_fid[offset] = *fid; + lci->lci_capa[offset] = capa; } static inline const char *mdd_obj_dev_name(const struct mdd_object *obj) @@ -619,32 +497,20 @@ static inline const char *mdd_obj_dev_name(const struct mdd_object *obj) #define MAX_ATIME_DIFF 60 -enum { - LPROC_MDD_NR -}; - static inline int mdd_permission_internal(const struct lu_env *env, - struct mdd_object *obj, - struct lu_attr *la, int mask) + struct mdd_object *obj, + const struct lu_attr *la, int mask) { - return __mdd_permission_internal(env, obj, la, mask, -1); + return __mdd_permission_internal(env, obj, la, mask, -1); } static inline int mdd_permission_internal_locked(const struct lu_env *env, - struct mdd_object *obj, - struct lu_attr *la, int mask, - enum mdd_object_role role) + struct mdd_object *obj, + const struct lu_attr *la, + int mask, + enum mdd_object_role role) { - return __mdd_permission_internal(env, obj, la, mask, role); -} - -static inline int mdo_data_get(const struct lu_env *env, - struct mdd_object *obj, - void **data) -{ - struct dt_object *next = mdd_object_child(obj); - next->do_ops->do_data_get(env, next, data); - return 0; + return __mdd_permission_internal(env, obj, la, mask, role); } /* mdd inline func for calling osd_dt_object ops */ @@ -748,41 +614,40 @@ int mdo_xattr_list(const struct lu_env *env, struct mdd_object *obj, } static inline -int mdo_index_try(const struct lu_env *env, struct mdd_object *obj, - const struct dt_index_features *feat) -{ - struct dt_object *next = mdd_object_child(obj); - return next->do_ops->do_index_try(env, next, feat); -} - -static inline int mdo_declare_index_insert(const struct lu_env *env, struct mdd_object *obj, - const struct lu_fid *fid, const char *name, - struct thandle *handle) + const struct lu_fid *fid, __u32 type, + const char *name, struct thandle *handle) { - struct dt_object *next = mdd_object_child(obj); - int rc = 0; + struct dt_object *next = mdd_object_child(obj); + int rc = 0; + + /* + * if the object doesn't exist yet, then it's supposed to be created + * and declaration of the creation should be enough to insert ./.. + */ - /* - * if the object doesn't exist yet, then it's supposed to be created - * and declaration of the creation should be enough to insert ./.. - */ /* FIXME: remote object should not be awared by MDD layer, but local * creation does not declare insert ./.. (comments above), which * is required by remote directory creation. * This remote check should be removed when mdd_object_exists check is * removed. */ - if (mdd_object_exists(obj) || mdd_object_remote(obj)) { - rc = -ENOTDIR; - if (dt_try_as_dir(env, next)) - rc = dt_declare_insert(env, next, - (struct dt_rec *)fid, - (const struct dt_key *)name, - handle); - } + if (mdd_object_exists(obj) || mdd_object_remote(obj)) { + rc = -ENOTDIR; + if (dt_try_as_dir(env, next)) { + struct dt_insert_rec *rec = + &mdd_env_info(env)->mti_dt_rec; + + rec->rec_fid = fid; + rec->rec_type = type; + rc = dt_declare_insert(env, next, + (const struct dt_rec *)rec, + (const struct dt_key *)name, + handle); + } + } - return rc; + return rc; } static inline @@ -858,23 +723,10 @@ int mdo_create_obj(const struct lu_env *env, struct mdd_object *o, struct thandle *handle) { struct dt_object *next = mdd_object_child(o); - struct lu_ucred *uc = lu_ucred(env); - __u32 saved; int rc; - /* - * LU-974 enforce client umask in creation. - * TODO: CMD needs to handle this for remote object. - */ - if (likely(uc != NULL)) - saved = xchg(¤t->fs->umask, uc->uc_umask & S_IRWXUGO); - rc = next->do_ops->do_create(env, next, attr, hint, dof, handle); - /* restore previous umask value */ - if (likely(uc != NULL)) - current->fs->umask = saved; - return rc; }