X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_internal.h;h=8e2345832b91f897b657cb04731f1d4fc18fed0d;hp=3cbe6d0c8fec7666e5ff5e13a226721681180dfe;hb=666f6ae30ed7f0c5015f659cd274685a08bd27bc;hpb=b3fa6d5458e8ae1e4b695e03097c638db2738a38 diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h index 3cbe6d0..8e23458 100644 --- a/lustre/mdd/mdd_internal.h +++ b/lustre/mdd/mdd_internal.h @@ -1,27 +1,41 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: - * mdd/mdd_internel.c * - * Copyright (C) 2006 Cluster File Systems, Inc. - * Author: Wang Di + * GPL HEADER START * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/mdd/mdd_internal.h + * + * Author: Wang Di */ #ifndef _MDD_INTERNAL_H @@ -29,13 +43,33 @@ #include -#include +#include +#include #include #include #include #include #include #include +#ifdef HAVE_QUOTA_SUPPORT +# include +#endif +#include + +#ifdef HAVE_QUOTA_SUPPORT +/* quota stuff */ +extern quota_interface_t *mds_quota_interface_ref; + +static inline void mdd_quota_wrapper(struct lu_attr *la, unsigned int *qids) +{ + qids[USRQUOTA] = la->la_uid; + qids[GRPQUOTA] = la->la_gid; +} +#endif + +/* PDO lock is unnecessary for current MDT stack because operations + * are already protected by ldlm lock */ +#define MDD_DISABLE_PDO_LOCK 1 enum mdd_txn_op { MDD_TXN_OBJECT_DESTROY_OP = 0, @@ -58,6 +92,34 @@ struct mdd_txn_op_descr { unsigned int mod_credits; }; +/* Changelog flags */ +/** changelog is recording */ +#define CLM_ON 0x00001 +/** internal error prevented changelogs from starting */ +#define CLM_ERR 0x00002 +/* Marker flags */ +/** changelogs turned on */ +#define CLM_START 0x10000 +/** changelogs turned off */ +#define CLM_FINI 0x20000 +/** some changelog records purged */ +#define CLM_PURGE 0x40000 + +struct mdd_changelog { + cfs_spinlock_t mc_lock; /* for index */ + int mc_flags; + int mc_mask; + __u64 mc_index; + __u64 mc_starttime; + cfs_spinlock_t mc_user_lock; + int mc_lastuser; +}; + +/** Objects in .lustre dir */ +struct mdd_dot_lustre_objs { + struct mdd_object *mdd_obf; +}; + struct mdd_device { struct md_device mdd_md_dev; struct dt_device *mdd_child; @@ -69,6 +131,11 @@ struct mdd_device { cfs_proc_dir_entry_t *mdd_proc_entry; struct lprocfs_stats *mdd_stats; struct mdd_txn_op_descr mdd_tod[MDD_TXN_LAST_OP]; + 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; + unsigned int mdd_sync_permission; }; enum mod_flags { @@ -76,50 +143,64 @@ enum mod_flags { DEAD_OBJ = 1 << 0, APPEND_OBJ = 1 << 1, IMMUTE_OBJ = 1 << 2, - ORPHAN_OBJ = 1 << 3 + ORPHAN_OBJ = 1 << 3, + MNLINK_OBJ = 1 << 4 }; #define LUSTRE_APPEND_FL LDISKFS_APPEND_FL #define LUSTRE_IMMUTABLE_FL LDISKFS_IMMUTABLE_FL #define LUSTRE_DIRSYNC_FL LDISKFS_DIRSYNC_FL +enum mdd_object_role { + MOR_SRC_PARENT, + MOR_SRC_CHILD, + MOR_TGT_PARENT, + MOR_TGT_CHILD, + MOR_TGT_ORPHAN +}; + struct mdd_object { - struct md_object mod_obj; + struct md_object mod_obj; /* open count */ __u32 mod_count; __u32 mod_valid; + __u64 mod_cltime; unsigned long mod_flags; struct dynlock mod_pdlock; +#ifdef CONFIG_LOCKDEP + /* "dep_map" name is assumed by lockdep.h macros. */ + struct lockdep_map dep_map; +#endif }; -struct orph_key { - /* fid of the object*/ - struct lu_fid ok_fid; - /* type of operation: unlink, truncate */ - __u32 ok_op; -} __attribute__((packed)); - struct mdd_thread_info { struct txn_param mti_param; struct lu_fid mti_fid; + struct lu_fid mti_fid2; /* used for be & cpu converting */ struct lu_attr mti_la; - struct md_attr mti_ma; struct lu_attr mti_la_for_fix; + struct md_attr mti_ma; struct obd_info mti_oi; - struct orph_key mti_orph_key; + char mti_orph_key[NAME_MAX + 1]; 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 obdo mti_oa; char mti_xattr_buf[LUSTRE_POSIX_ACL_MAX_SIZE]; - struct lu_fid mti_fid2; /* used for be & cpu converting */ - struct lu_fid_pack mti_pack; 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; }; +extern const char orph_index_name[]; + +extern const struct dt_index_features orph_index_features; + struct lov_mds_md *mdd_max_lmm_get(const struct lu_env *env, struct mdd_device *mdd); @@ -130,6 +211,9 @@ 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); @@ -141,7 +225,8 @@ 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 lu_attr *la); -void mdd_lov_objid_update(const struct lu_env *env, struct mdd_device *mdd); +int mdd_lov_objid_prepare(struct mdd_device *mdd, struct lov_mds_md *lmm); +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); @@ -149,11 +234,19 @@ 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); -int mdd_attr_set_internal(const struct lu_env *env, struct mdd_object *o, - const struct lu_attr *attr, struct thandle *handle, - const int needacl); +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_object_kill(const struct lu_env *env, struct mdd_object *obj, struct md_attr *ma); int mdd_iattr_get(const struct lu_env *env, struct mdd_object *mdd_obj, @@ -163,32 +256,46 @@ int mdd_attr_get_internal_locked(const struct lu_env *env, struct md_attr *ma); int mdd_object_create_internal(const struct lu_env *env, struct mdd_object *p, struct mdd_object *c, struct md_attr *ma, - struct thandle *handle); -int mdd_attr_set_internal_locked(const struct lu_env *env, - struct mdd_object *o, - const struct lu_attr *attr, - struct thandle *handle, const int needacl); + 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); + /* mdd_lock.c */ -void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj); -void mdd_read_lock(const struct lu_env *env, struct mdd_object *obj); +void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj, + enum mdd_object_role role); +void mdd_read_lock(const struct lu_env *env, struct mdd_object *obj, + enum mdd_object_role role); 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); struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env, struct mdd_object *obj, - const char *name); + const char *name, + enum mdd_object_role role); struct dynlock_handle *mdd_pdo_read_lock(const struct lu_env *env, struct mdd_object *obj, - const char *name); + const char *name, + enum mdd_object_role role); void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj, struct dynlock_handle *dlh); void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj, struct dynlock_handle *dlh); /* mdd_dir.c */ +int mdd_is_subdir(const struct lu_env *env, struct md_object *mo, + const struct lu_fid *fid, struct lu_fid *sfid); +void __mdd_ref_add(const struct lu_env *env, struct mdd_object *obj, + struct thandle *handle); +void __mdd_ref_del(const struct lu_env *env, struct mdd_object *obj, + struct thandle *handle, int is_dot); int mdd_may_create(const struct lu_env *env, struct mdd_object *pobj, struct mdd_object *cobj, int check_perm, int check_nlink); int mdd_may_unlink(const struct lu_env *env, struct mdd_object *pobj, @@ -201,10 +308,20 @@ int mdd_unlink_sanity_check(const struct lu_env *env, struct mdd_object *pobj, 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, - struct mdd_object *child, struct md_attr *ma, - struct thandle *handle); + const struct lu_name *lname, struct mdd_object *child, + struct md_attr *ma, 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); +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); +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_unlink_log(const struct lu_env *env, struct mdd_device *mdd, struct mdd_object *mdd_cobj, struct md_attr *ma); @@ -236,22 +353,75 @@ 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 mdd_txn_init_credits(const struct lu_env *env, struct mdd_device *mdd); +/* 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_lprocfs_time_start(const struct lu_env *env); void mdd_lprocfs_time_end(const struct lu_env *env, struct mdd_device *mdd, int op); +/* 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 md_dir_operations mdd_dir_ops; -extern struct md_object_operations mdd_obj_ops; +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); +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); + +/* mdd_quota.c*/ +#ifdef HAVE_QUOTA_SUPPORT +int mdd_quota_notify(const struct lu_env *env, struct md_device *m); +int mdd_quota_setup(const struct lu_env *env, struct md_device *m, + void *data); +int mdd_quota_cleanup(const struct lu_env *env, struct md_device *m); +int mdd_quota_recovery(const struct lu_env *env, struct md_device *m); +int mdd_quota_check(const struct lu_env *env, struct md_device *m, + __u32 type); +int mdd_quota_on(const struct lu_env *env, struct md_device *m, + __u32 type); +int mdd_quota_off(const struct lu_env *env, struct md_device *m, + __u32 type); +int mdd_quota_setinfo(const struct lu_env *env, struct md_device *m, + __u32 type, __u32 id, struct obd_dqinfo *dqinfo); +int mdd_quota_getinfo(const struct lu_env *env, const struct md_device *m, + __u32 type, __u32 id, struct obd_dqinfo *dqinfo); +int mdd_quota_setquota(const struct lu_env *env, struct md_device *m, + __u32 type, __u32 id, struct obd_dqblk *dqblk); +int mdd_quota_getquota(const struct lu_env *env, const struct md_device *m, + __u32 type, __u32 id, struct obd_dqblk *dqblk); +int mdd_quota_getoinfo(const struct lu_env *env, const struct md_device *m, + __u32 type, __u32 id, struct obd_dqinfo *dqinfo); +int mdd_quota_getoquota(const struct lu_env *env, const struct md_device *m, + __u32 type, __u32 id, struct obd_dqblk *dqblk); +int mdd_quota_invalidate(const struct lu_env *env, struct md_device *m, + __u32 type); +int mdd_quota_finvalidate(const struct lu_env *env, struct md_device *m, + __u32 type); +#endif /* mdd_trans.c */ void mdd_txn_param_build(const struct lu_env *env, struct mdd_device *mdd, enum mdd_txn_op); int mdd_log_txn_param_build(const struct lu_env *env, struct md_object *obj, struct md_attr *ma, enum mdd_txn_op); +int mdd_setattr_txn_param_build(const struct lu_env *env, struct md_object *obj, + struct md_attr *ma, enum mdd_txn_op); + +int mdd_lov_destroy(const struct lu_env *env, struct mdd_device *mdd, + struct mdd_object *obj, struct lu_attr *la); static inline void mdd_object_put(const struct lu_env *env, struct mdd_object *o) @@ -277,15 +447,14 @@ int mdd_txn_commit_cb(const struct lu_env *env, struct thandle *txn, struct lu_object *mdd_object_alloc(const struct lu_env *env, const struct lu_object_header *hdr, struct lu_device *d); +struct llog_changelog_rec; +int mdd_changelog_llog_write(struct mdd_device *mdd, + struct llog_changelog_rec *rec, + struct thandle *handle); +int mdd_changelog_llog_cancel(struct mdd_device *mdd, long long endrec); +int mdd_changelog_write_header(struct mdd_device *mdd, int markerflags); +int mdd_changelog_on(struct mdd_device *mdd, int on); -/* mdd_object.c */ -int accmode(const struct lu_env *env, struct lu_attr *la, int flags); -extern struct lu_context_key mdd_thread_key; -extern 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); /* mdd_permission.c */ #define mdd_cap_t(x) (x) @@ -294,24 +463,21 @@ struct mdd_object *mdd_object_find(const struct lu_env *env, #define mdd_cap_raised(c, flag) (mdd_cap_t(c) & MDD_CAP_TO_MASK(flag)) /* capable() is copied from linux kernel! */ -static inline int mdd_capable(struct md_ucred *uc, int cap) +static inline int mdd_capable(struct md_ucred *uc, cfs_cap_t cap) { if (mdd_cap_raised(uc->mu_cap, cap)) return 1; return 0; } -int mdd_in_group_p(struct md_ucred *uc, gid_t grp); -int mdd_acl_def_get(const struct lu_env *env, struct mdd_object *mdd_obj, +int mdd_def_acl_get(const struct lu_env *env, struct mdd_object *mdd_obj, struct md_attr *ma); int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode, struct thandle *handle); int __mdd_acl_init(const struct lu_env *env, struct mdd_object *obj, struct lu_buf *buf, __u32 *mode, struct thandle *handle); -int mdd_acl_init(const struct lu_env *env, struct mdd_object *pobj, - struct mdd_object *cobj, __u32 *mode, struct thandle *handle); int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj, - struct lu_attr *la, int mask, int needlock); + 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); @@ -320,24 +486,24 @@ int mdd_capa_get(const struct lu_env *env, struct md_object *obj, 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); + return ergo(d != NULL && d->ld_ops != NULL, d->ld_ops == &mdd_lu_ops); } static inline struct mdd_device* lu2mdd_dev(struct lu_device *d) { - LASSERT(lu_device_is_mdd(d)); - return container_of0(d, struct mdd_device, mdd_md_dev.md_lu_dev); + LASSERT(lu_device_is_mdd(d)); + return container_of0(d, struct mdd_device, mdd_md_dev.md_lu_dev); } static inline struct lu_device *mdd2lu_dev(struct mdd_device *d) { - return (&d->mdd_md_dev.md_lu_dev); + return (&d->mdd_md_dev.md_lu_dev); } static inline struct mdd_object *lu2mdd_obj(struct lu_object *o) { - LASSERT(ergo(o != NULL, lu_device_is_mdd(o->lo_dev))); - return container_of0(o, struct mdd_object, mod_obj.mo_lu); + LASSERT(ergo(o != NULL, lu_device_is_mdd(o->lo_dev))); + return container_of0(o, struct mdd_object, mod_obj.mo_lu); } static inline struct mdd_device* mdo2mdd(struct md_object *mdo) @@ -350,7 +516,8 @@ static inline struct mdd_object* md2mdd_obj(struct md_object *mdo) return container_of0(mdo, struct mdd_object, mod_obj); } -static inline struct dt_device_operations *mdd_child_ops(struct mdd_device *d) +static inline const struct dt_device_operations * +mdd_child_ops(struct mdd_device *d) { return d->mdd_child->dd_ops; } @@ -381,7 +548,7 @@ static inline const struct lu_fid *mdo2fid(const struct mdd_object *obj) return lu_object_fid(&obj->mod_obj.mo_lu); } -static inline umode_t mdd_object_type(const struct mdd_object *obj) +static inline cfs_umode_t mdd_object_type(const struct mdd_object *obj) { return lu_object_attr(&obj->mod_obj.mo_lu); } @@ -415,6 +582,11 @@ static inline int mdd_is_append(struct mdd_object *obj) return obj->mod_flags & APPEND_OBJ; } +static inline int mdd_is_mnlink(struct mdd_object *obj) +{ + return obj->mod_flags & MNLINK_OBJ; +} + static inline int mdd_object_exists(struct mdd_object *obj) { return lu_object_exists(mdd2lu_obj(obj)); @@ -456,6 +628,8 @@ static inline void mdd_set_capainfo(const struct lu_env *env, int offset, ci->mc_capa[offset] = capa; } +#define MAX_ATIME_DIFF 60 + enum { LPROC_MDD_NR }; @@ -464,14 +638,24 @@ static inline int mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj, struct lu_attr *la, int mask) { - return __mdd_permission_internal(env, obj, la, mask, 0); + 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) + 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) { - return __mdd_permission_internal(env, obj, la, mask, 1); + struct dt_object *next = mdd_object_child(obj); + next->do_ops->do_data_get(env, next, data); + return 0; } /* mdd inline func for calling osd_dt_object ops */ @@ -501,7 +685,7 @@ static inline int mdo_xattr_get(const struct lu_env *env,struct mdd_object *obj, static inline int mdo_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 fl, struct thandle *handle, struct lustre_capa *capa) { struct dt_object *next = mdd_object_child(obj); @@ -519,7 +703,7 @@ static inline int mdo_xattr_del(const struct lu_env *env,struct mdd_object *obj, return next->do_ops->do_xattr_del(env, next, name, handle, capa); } -static inline +static inline int mdo_xattr_list(const struct lu_env *env, struct mdd_object *obj, struct lu_buf *buf, struct lustre_capa *capa) { @@ -528,7 +712,7 @@ int mdo_xattr_list(const struct lu_env *env, struct mdd_object *obj, return next->do_ops->do_xattr_list(env, next, buf, capa); } -static inline +static inline int mdo_index_try(const struct lu_env *env, struct mdd_object *obj, const struct dt_index_features *feat) { @@ -552,18 +736,19 @@ static inline void mdo_ref_del(const struct lu_env *env, struct mdd_object *obj, return next->do_ops->do_ref_del(env, next, handle); } -static inline -int mdo_create_obj(const struct lu_env *env, struct mdd_object *o, +static inline +int mdo_create_obj(const struct lu_env *env, struct mdd_object *o, struct lu_attr *attr, struct dt_allocation_hint *hint, + struct dt_object_format *dof, struct thandle *handle) { struct dt_object *next = mdd_object_child(o); - return next->do_ops->do_create(env, next, attr, hint, handle); + return next->do_ops->do_create(env, next, attr, hint, dof, handle); } static inline struct obd_capa *mdo_capa_get(const struct lu_env *env, - struct mdd_object *obj, + struct mdd_object *obj, struct lustre_capa *old, __u64 opc) {