X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_internal.h;h=e1a3169e5bca6ebaf4493d7d330f17f9c5c73568;hb=2d617260aaa5f778ab8dcb006e2a827f4b8f8567;hp=c855f802c81aa67a8c549177a311cdcea4c1cd2a;hpb=c159c408293fbebf71a948e630aa9f637f3c8ffe;p=fs%2Flustre-release.git diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h index c855f80..e1a3169 100644 --- a/lustre/mdd/mdd_internal.h +++ b/lustre/mdd/mdd_internal.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/ @@ -41,8 +41,6 @@ #ifndef _MDD_INTERNAL_H #define _MDD_INTERNAL_H -#include - #include #include #include @@ -50,11 +48,11 @@ #include #include #include -#include #ifdef HAVE_QUOTA_SUPPORT # include #endif #include +#include #ifdef HAVE_QUOTA_SUPPORT /* quota stuff */ @@ -62,31 +60,14 @@ extern quota_interface_t *mds_quota_interface_ref; static inline void mdd_quota_wrapper(struct lu_attr *la, unsigned int *qids) { - qids[0] = la->la_uid; - qids[1] = la->la_gid; + qids[USRQUOTA] = la->la_uid; + qids[GRPQUOTA] = la->la_gid; } #endif -enum mdd_txn_op { - MDD_TXN_OBJECT_DESTROY_OP = 0, - MDD_TXN_OBJECT_CREATE_OP, - MDD_TXN_ATTR_SET_OP, - MDD_TXN_XATTR_SET_OP, - MDD_TXN_INDEX_INSERT_OP, - MDD_TXN_INDEX_DELETE_OP, - MDD_TXN_LINK_OP, - MDD_TXN_UNLINK_OP, - MDD_TXN_RENAME_OP, - MDD_TXN_RENAME_TGT_OP, - MDD_TXN_CREATE_DATA_OP, - MDD_TXN_MKDIR_OP, - MDD_TXN_LAST_OP -}; - -struct mdd_txn_op_descr { - enum mdd_txn_op mod_op; - unsigned int mod_credits; -}; +/* PDO lock is unnecessary for current MDT stack because operations + * are already protected by ldlm lock */ +#define MDD_DISABLE_PDO_LOCK 1 /* Changelog flags */ /** changelog is recording */ @@ -102,12 +83,42 @@ struct mdd_txn_op_descr { #define CLM_PURGE 0x40000 struct mdd_changelog { - spinlock_t mc_lock; /* for index */ - cfs_waitq_t mc_waitq; + 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; +}; + +extern const char lfsck_bookmark_name[]; + +struct md_lfsck { + cfs_mutex_t ml_mutex; + cfs_spinlock_t ml_lock; + struct ptlrpc_thread ml_thread; + struct dt_object *ml_bookmark_obj; + struct dt_object *ml_it_obj; + __u32 ml_new_scanned; + /* Arguments for low layer iteration. */ + __u32 ml_args; + + /* Raw value for LFSCK speed limit. */ + __u32 ml_speed_limit; + + /* Schedule for every N objects. */ + __u32 ml_sleep_rate; + + /* Sleep N jiffies for each schedule. */ + __u32 ml_sleep_jif; + __u16 ml_version; + unsigned int ml_paused:1; /* The lfsck is paused. */ }; struct mdd_device { @@ -116,13 +127,17 @@ struct mdd_device { struct obd_device *mdd_obd_dev; struct lu_fid mdd_root_fid; struct dt_device_param mdd_dt_conf; - struct dt_object *mdd_orphans; + struct dt_object *mdd_orphans; /* PENDING directory */ + struct dt_object *mdd_capa; struct dt_txn_callback mdd_txn_cb; 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; + struct md_lfsck mdd_lfsck; + unsigned int mdd_sync_permission; }; enum mod_flags { @@ -131,13 +146,8 @@ enum mod_flags { APPEND_OBJ = 1 << 1, IMMUTE_OBJ = 1 << 2, 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, @@ -153,7 +163,9 @@ 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; @@ -161,13 +173,15 @@ struct mdd_object { }; 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 lu_attr mti_la_for_fix; struct md_attr mti_ma; struct obd_info mti_oi; + /* mti_orph_ent and mti_orph_key must be conjoint, + * then mti_orph_ent::lde_name will be mti_orph_key. */ + struct lu_dirent mti_orph_ent; char mti_orph_key[NAME_MAX + 1]; struct obd_trans_info mti_oti; struct lu_buf mti_buf; @@ -175,7 +189,6 @@ struct mdd_thread_info { struct lu_name mti_name; struct obdo mti_oa; char mti_xattr_buf[LUSTRE_POSIX_ACL_MAX_SIZE]; - struct lu_fid_pack mti_pack; struct dt_allocation_hint mti_hint; struct lov_mds_md *mti_max_lmm; int mti_max_lmm_size; @@ -189,6 +202,7 @@ 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); @@ -212,12 +226,21 @@ int mdd_lov_set_md(const struct lu_env *env, struct mdd_object *pobj, 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); + 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, @@ -225,6 +248,10 @@ int mdd_get_md_locked(const struct lu_env *env, struct mdd_object *obj, 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_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, @@ -235,10 +262,14 @@ int mdd_attr_check_set_internal(const struct lu_env *env, 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 md_attr *ma, struct thandle *handle); int mdd_iattr_get(const struct lu_env *env, struct mdd_object *mdd_obj, struct md_attr *ma); +int mdd_attr_get_internal(const struct lu_env *env, struct mdd_object *mdd_obj, + struct md_attr *ma); int mdd_attr_get_internal_locked(const struct lu_env *env, struct mdd_object *mdd_obj, struct md_attr *ma); @@ -261,26 +292,21 @@ 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, - enum mdd_object_role role); -struct dynlock_handle *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_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, - struct dynlock_handle *dlh); + void *dlh); void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj, - struct dynlock_handle *dlh); + void *dlh); /* mdd_dir.c */ -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_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); int mdd_may_unlink(const struct lu_env *env, struct mdd_object *pobj, @@ -308,6 +334,8 @@ 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); @@ -323,6 +351,10 @@ 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); + struct mdd_thread_info *mdd_env_info(const struct lu_env *env); struct lu_buf *mdd_buf_get(const struct lu_env *env, void *area, ssize_t len); @@ -336,7 +368,10 @@ int __mdd_orphan_del(const struct lu_env *, struct mdd_object *, struct thandle *); 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); +int orph_declare_index_insert(const struct lu_env *, struct mdd_object *, + 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); @@ -362,7 +397,23 @@ 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(const struct lu_env *env, enum changelog_rec_type type, + int flags, struct md_object *obj); +int mdd_declare_object_create_internal(const struct lu_env *env, + struct mdd_object *p, + struct mdd_object *c, + struct md_attr *ma, + struct thandle *handle, + const struct md_op_spec *spec); /* mdd_quota.c*/ #ifdef HAVE_QUOTA_SUPPORT int mdd_quota_notify(const struct lu_env *env, struct md_device *m); @@ -371,7 +422,7 @@ int mdd_quota_setup(const struct lu_env *env, struct md_device *m, 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, - struct obd_export *exp, __u32 type); + __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, @@ -395,13 +446,6 @@ int mdd_quota_finvalidate(const struct lu_env *env, struct md_device *m, #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); @@ -411,20 +455,25 @@ static inline void mdd_object_put(const struct lu_env *env, lu_object_put(env, &o->mod_obj.mo_lu); } -struct thandle* mdd_trans_start(const struct lu_env *env, - struct mdd_device *); - +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_start_cb(const struct lu_env *env, struct txn_param *param, - void *cookie); - 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 */ +void mdd_lfsck_set_speed(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); +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_txn_commit_cb(const struct lu_env *env, struct thandle *txn, - void *cookie); /* mdd_device.c */ struct lu_object *mdd_object_alloc(const struct lu_env *env, const struct lu_object_header *hdr, @@ -433,8 +482,13 @@ 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_ext_llog_write(struct mdd_device *mdd, + struct llog_changelog_ext_rec *rec, + struct thandle *handle); +int mdd_changelog_llog_cancel(const struct lu_env *env, 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_permission.c */ #define mdd_cap_t(x) (x) @@ -455,6 +509,8 @@ 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_declare_acl_init(const struct lu_env *env, struct mdd_object *obj, + int is_dir, 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_permission_internal(const struct lu_env *env, struct mdd_object *obj, @@ -529,16 +585,7 @@ static inline const struct lu_fid *mdo2fid(const struct mdd_object *obj) return lu_object_fid(&obj->mod_obj.mo_lu); } -static inline const struct dt_rec *__mdd_fid_rec(const struct lu_env *env, - const struct lu_fid *fid) -{ - struct lu_fid_pack *pack = &mdd_env_info(env)->mti_pack; - - fid_pack(pack, fid, &mdd_env_info(env)->mti_fid2); - return (const struct dt_rec *)pack; -} - -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); } @@ -572,11 +619,6 @@ 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)); @@ -598,7 +640,7 @@ static inline struct lustre_capa *mdd_object_capa(const struct lu_env *env, if (!ci) return BYPASS_CAPA; for (i = 0; i < MD_CAPAINFO_MAX; i++) - if (ci->mc_fid[i] && lu_fid_eq(ci->mc_fid[i], fid)) + if (lu_fid_eq(&ci->mc_fid[i], fid)) return ci->mc_capa[i]; return NULL; } @@ -614,10 +656,15 @@ static inline void mdd_set_capainfo(const struct lu_env *env, int offset, /* NB: in mdt_init0 */ if (!ci) return; - ci->mc_fid[offset] = fid; + ci->mc_fid[offset] = *fid; ci->mc_capa[offset] = capa; } +static inline const char *mdd_obj_dev_name(const struct mdd_object *obj) +{ + return lu_dev_name(obj->mod_obj.mo_lu.lo_dev); +} + #define MAX_ATIME_DIFF 60 enum { @@ -656,12 +703,27 @@ static inline int mdo_attr_get(const struct lu_env *env, struct mdd_object *obj, return next->do_ops->do_attr_get(env, next, la, capa); } -static inline int mdo_attr_set(const struct lu_env *env, struct mdd_object *obj, - const struct lu_attr *la, struct thandle *handle, +static inline int mdo_declare_attr_set(const struct lu_env *env, + struct mdd_object *obj, + const struct lu_attr *la, + struct thandle *handle) +{ + struct dt_object *next = mdd_object_child(obj); + return dt_declare_attr_set(env, next, la, handle); +} + +static inline int mdo_attr_set(const struct lu_env *env, + struct mdd_object *obj, + const struct lu_attr *la, + struct thandle *handle, struct lustre_capa *capa) { struct dt_object *next = mdd_object_child(obj); - LASSERT(mdd_object_exists(obj)); + if (mdd_object_exists(obj) == 0) { + CERROR("%s: object "DFID" not found: rc = -2\n", + mdd_obj_dev_name(obj), PFID(mdd_object_fid(obj))); + return -ENOENT; + } return next->do_ops->do_attr_set(env, next, la, handle, capa); } @@ -673,23 +735,50 @@ static inline int mdo_xattr_get(const struct lu_env *env,struct mdd_object *obj, return next->do_ops->do_xattr_get(env, next, buf, name, capa); } +static inline int mdo_declare_xattr_set(const struct lu_env *env, + struct mdd_object *obj, + const struct lu_buf *buf, + const char *name, + int fl, struct thandle *handle) +{ + struct dt_object *next = mdd_object_child(obj); + return dt_declare_xattr_set(env, next, buf, name, fl, handle); +} + 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, struct lustre_capa *capa) { struct dt_object *next = mdd_object_child(obj); - LASSERT(mdd_object_exists(obj)); + if (mdd_object_exists(obj) == 0) { + CERROR("%s: object "DFID" not found: rc = -2\n", + mdd_obj_dev_name(obj), PFID(mdd_object_fid(obj))); + return -ENOENT; + } return next->do_ops->do_xattr_set(env, next, buf, name, fl, handle, capa); } +static inline int mdo_declare_xattr_del(const struct lu_env *env, + struct mdd_object *obj, + const char *name, + struct thandle *handle) +{ + struct dt_object *next = mdd_object_child(obj); + return dt_declare_xattr_del(env, next, name, handle); +} + static inline int mdo_xattr_del(const struct lu_env *env,struct mdd_object *obj, const char *name, struct thandle *handle, struct lustre_capa *capa) { struct dt_object *next = mdd_object_child(obj); - LASSERT(mdd_object_exists(obj)); + if (mdd_object_exists(obj) == 0) { + CERROR("%s: object "DFID" not found: rc = -2\n", + mdd_obj_dev_name(obj), PFID(mdd_object_fid(obj))); + return -ENOENT; + } return next->do_ops->do_xattr_del(env, next, name, handle, capa); } @@ -698,7 +787,11 @@ int mdo_xattr_list(const struct lu_env *env, struct mdd_object *obj, struct lu_buf *buf, struct lustre_capa *capa) { struct dt_object *next = mdd_object_child(obj); - LASSERT(mdd_object_exists(obj)); + if (mdd_object_exists(obj) == 0) { + CERROR("%s: object "DFID" not found: rc = -2\n", + mdd_obj_dev_name(obj), PFID(mdd_object_fid(obj))); + return -ENOENT; + } return next->do_ops->do_xattr_list(env, next, buf, capa); } @@ -710,23 +803,96 @@ int mdo_index_try(const struct lu_env *env, struct mdd_object *obj, return next->do_ops->do_index_try(env, next, feat); } -static inline void mdo_ref_add(const struct lu_env *env, struct mdd_object *obj, - struct thandle *handle) +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) { struct dt_object *next = mdd_object_child(obj); - LASSERT(mdd_object_exists(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 (mdd_object_exists(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); + } + + return rc; +} + +static inline +int mdo_declare_index_delete(const struct lu_env *env, struct mdd_object *obj, + const char *name, struct thandle *handle) +{ + struct dt_object *next = mdd_object_child(obj); + + if (!dt_try_as_dir(env, next)) + return -ENOTDIR; + + return dt_declare_delete(env, next, (const struct dt_key *)name, + handle); +} + +static inline int mdo_declare_ref_add(const struct lu_env *env, + struct mdd_object *obj, + struct thandle *handle) +{ + struct dt_object *next = mdd_object_child(obj); + return dt_declare_ref_add(env, next, handle); +} + +static inline int mdo_ref_add(const struct lu_env *env, struct mdd_object *obj, + struct thandle *handle) +{ + struct dt_object *next = mdd_object_child(obj); + if (mdd_object_exists(obj) == 0) { + CERROR("%s: object "DFID" not found: rc = -2\n", + mdd_obj_dev_name(obj), PFID(mdd_object_fid(obj))); + return -ENOENT; + } return next->do_ops->do_ref_add(env, next, handle); } -static inline void mdo_ref_del(const struct lu_env *env, struct mdd_object *obj, - struct thandle *handle) +static inline int mdo_declare_ref_del(const struct lu_env *env, + struct mdd_object *obj, + struct thandle *handle) { struct dt_object *next = mdd_object_child(obj); - LASSERT(mdd_object_exists(obj)); + return dt_declare_ref_del(env, next, handle); +} + +static inline int mdo_ref_del(const struct lu_env *env, struct mdd_object *obj, + struct thandle *handle) +{ + struct dt_object *next = mdd_object_child(obj); + if (mdd_object_exists(obj) == 0) { + CERROR("%s: object "DFID" not found: rc = -2\n", + mdd_obj_dev_name(obj), PFID(mdd_object_fid(obj))); + return -ENOENT; + } return next->do_ops->do_ref_del(env, next, handle); } static inline +int mdo_declare_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_declare_create(env, next, attr, hint, + dof, handle); +} + +static inline int mdo_create_obj(const struct lu_env *env, struct mdd_object *o, struct lu_attr *attr, struct dt_allocation_hint *hint, @@ -737,13 +903,33 @@ int mdo_create_obj(const struct lu_env *env, struct mdd_object *o, return next->do_ops->do_create(env, next, attr, hint, dof, handle); } +static inline +int mdo_declare_destroy(const struct lu_env *env, struct mdd_object *o, + struct thandle *handle) +{ + struct dt_object *next = mdd_object_child(o); + return dt_declare_destroy(env, next, handle); +} + +static inline +int mdo_destroy(const struct lu_env *env, struct mdd_object *o, + struct thandle *handle) +{ + struct dt_object *next = mdd_object_child(o); + return dt_destroy(env, next, handle); +} + static inline struct obd_capa *mdo_capa_get(const struct lu_env *env, struct mdd_object *obj, struct lustre_capa *old, __u64 opc) { struct dt_object *next = mdd_object_child(obj); - LASSERT(mdd_object_exists(obj)); + if (mdd_object_exists(obj) == 0) { + CERROR("%s: object "DFID" not found: rc = -2\n", + mdd_obj_dev_name(obj), PFID(mdd_object_fid(obj))); + return ERR_PTR(-ENOENT); + } return next->do_ops->do_capa_get(env, next, old, opc); }