X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_dir.c;h=02626460923b7786d2061e9a4a2f10a87cc9fa4c;hp=98e4e28eeae2938e1c603cb9be79c9a45d798361;hb=b69b7de30c3977cb69a741099218bc4a81752717;hpb=7c243a561ffe8503a6abf5c4cafef0c3566192bc diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c index 98e4e28..0262646 100644 --- a/lustre/mdd/mdd_dir.c +++ b/lustre/mdd/mdd_dir.c @@ -295,6 +295,20 @@ static int mdd_dir_is_empty(const struct lu_env *env, RETURN(result); } +/** + * Determine if the target object can be hard linked, and right now it only + * checks if the link count reach the maximum limit. Note: for ldiskfs, the + * directory nlink count might exceed the maximum link count(see + * osd_object_ref_add), so it only check nlink for non-directories. + * + * \param[in] env thread environment + * \param[in] obj object being linked to + * \param[in] la attributes of \a obj + * + * \retval 0 if \a obj can be hard linked + * \retval negative error if \a obj is a directory or has too + * many links + */ static int __mdd_may_link(const struct lu_env *env, struct mdd_object *obj, const struct lu_attr *la) { @@ -303,25 +317,31 @@ static int __mdd_may_link(const struct lu_env *env, struct mdd_object *obj, LASSERT(la != NULL); - if (!S_ISDIR(la->la_mode)) - RETURN(0); - - /* - * Subdir count limitation can be broken through. - */ - if (la->la_nlink >= m->mdd_dt_conf.ddp_max_nlink) + /* Subdir count limitation can be broken through + * (see osd_object_ref_add), so only check non-directory here. */ + if (!S_ISDIR(la->la_mode) && + la->la_nlink >= m->mdd_dt_conf.ddp_max_nlink) RETURN(-EMLINK); - else - RETURN(0); + + RETURN(0); } -/* +/** * Check whether it may create the cobj under the pobj. - * cobj maybe NULL + * + * \param[in] env execution environment + * \param[in] pobj the parent directory + * \param[in] pattr the attribute of the parent directory + * \param[in] cobj the child to be created + * \param[in] check_perm if check WRITE|EXEC permission for parent + * + * \retval = 0 create the child under this dir is allowed + * \retval negative errno create the child under this dir is + * not allowed */ -int mdd_may_create(const struct lu_env *env, - struct mdd_object *pobj, const struct lu_attr *pattr, - struct mdd_object *cobj, bool check_perm, bool check_nlink) +int mdd_may_create(const struct lu_env *env, struct mdd_object *pobj, + const struct lu_attr *pattr, struct mdd_object *cobj, + bool check_perm) { struct mdd_thread_info *info = mdd_env_info(env); struct lu_buf *xbuf; @@ -351,9 +371,6 @@ int mdd_may_create(const struct lu_env *env, rc = mdd_permission_internal_locked(env, pobj, pattr, MAY_WRITE | MAY_EXEC, MOR_TGT_PARENT); - if (!rc && check_nlink) - rc = __mdd_may_link(env, pobj, pattr); - RETURN(rc); } @@ -498,9 +515,20 @@ int mdd_may_delete(const struct lu_env *env, struct mdd_object *tpobj, RETURN(rc); } -/* - * tgt maybe NULL - * has mdd_write_lock on src already, but not on tgt yet +/** + * Check whether it can create the link file(linked to @src_obj) under + * the target directory(@tgt_obj), and src_obj has been locked by + * mdd_write_lock. + * + * \param[in] env execution environment + * \param[in] tgt_obj the target directory + * \param[in] tattr attributes of target directory + * \param[in] lname the link name + * \param[in] src_obj source object for link + * \param[in] cattr attributes for source object + * + * \retval = 0 it is allowed to create the link file under tgt_obj + * \retval negative error not allowed to create the link file */ static int mdd_link_sanity_check(const struct lu_env *env, struct mdd_object *tgt_obj, @@ -531,11 +559,9 @@ static int mdd_link_sanity_check(const struct lu_env *env, RETURN(-EPERM); LASSERT(src_obj != tgt_obj); - if (tgt_obj) { - rc = mdd_may_create(env, tgt_obj, tattr, NULL, true, false); - if (rc) - RETURN(rc); - } + rc = mdd_may_create(env, tgt_obj, tattr, NULL, true); + if (rc != 0) + RETURN(rc); rc = __mdd_may_link(env, src_obj, cattr); @@ -562,7 +588,8 @@ static int __mdd_index_delete_only(const struct lu_env *env, struct mdd_object * static int __mdd_index_insert_only(const struct lu_env *env, struct mdd_object *pobj, - const struct lu_fid *lf, const char *name, + const struct lu_fid *lf, __u32 type, + const char *name, struct thandle *handle, struct lustre_capa *capa) { @@ -571,12 +598,15 @@ static int __mdd_index_insert_only(const struct lu_env *env, ENTRY; if (dt_try_as_dir(env, next)) { - struct lu_ucred *uc = lu_ucred_check(env); - int ignore_quota; + struct dt_insert_rec *rec = &mdd_env_info(env)->mti_dt_rec; + struct lu_ucred *uc = lu_ucred_check(env); + int ignore_quota; + rec->rec_fid = lf; + rec->rec_type = type; ignore_quota = uc ? uc->uc_cap & CFS_CAP_SYS_RESOURCE_MASK : 1; rc = next->do_index_ops->dio_insert(env, next, - (struct dt_rec*)lf, + (const struct dt_rec *)rec, (const struct dt_key *)name, handle, capa, ignore_quota); } else { @@ -587,19 +617,21 @@ static int __mdd_index_insert_only(const struct lu_env *env, /* insert named index, add reference if isdir */ static int __mdd_index_insert(const struct lu_env *env, struct mdd_object *pobj, - const struct lu_fid *lf, const char *name, int is_dir, - struct thandle *handle, struct lustre_capa *capa) + const struct lu_fid *lf, __u32 type, + const char *name, struct thandle *handle, + struct lustre_capa *capa) { - int rc; - ENTRY; + int rc; + ENTRY; - rc = __mdd_index_insert_only(env, pobj, lf, name, handle, capa); - if (rc == 0 && is_dir) { - mdd_write_lock(env, pobj, MOR_TGT_PARENT); - mdo_ref_add(env, pobj, handle); - mdd_write_unlock(env, pobj); - } - RETURN(rc); + rc = __mdd_index_insert_only(env, pobj, lf, type, name, handle, capa); + if (rc == 0 && S_ISDIR(type)) { + mdd_write_lock(env, pobj, MOR_TGT_PARENT); + mdo_ref_add(env, pobj, handle); + mdd_write_unlock(env, pobj); + } + + RETURN(rc); } /* delete named index, drop reference if isdir */ @@ -1029,7 +1061,6 @@ int mdd_links_rename(const struct lu_env *env, struct linkea_data *ldata, int first, int check) { - int rc2 = 0; int rc = 0; ENTRY; @@ -1047,9 +1078,7 @@ int mdd_links_rename(const struct lu_env *env, rc = mdd_links_write(env, mdd_obj, ldata, handle); EXIT; out: - if (rc == 0) - rc = rc2; - if (rc) { + if (rc != 0) { int error = 1; if (rc == -EOVERFLOW || rc == -ENOSPC) error = 0; @@ -1084,10 +1113,10 @@ static inline int mdd_links_add(const struct lu_env *env, const struct lu_fid *pfid, const struct lu_name *lname, struct thandle *handle, - struct linkea_data *data, int first) + struct linkea_data *ldata, int first) { return mdd_links_rename(env, mdd_obj, NULL, NULL, - pfid, lname, handle, data, first, 0); + pfid, lname, handle, ldata, first, 0); } static inline int mdd_links_del(const struct lu_env *env, @@ -1206,18 +1235,19 @@ static inline int mdd_declare_links_del(const struct lu_env *env, } static int mdd_declare_link(const struct lu_env *env, - struct mdd_device *mdd, - struct mdd_object *p, - struct mdd_object *c, - const struct lu_name *name, + struct mdd_device *mdd, + struct mdd_object *p, + struct mdd_object *c, + const struct lu_name *name, struct thandle *handle, struct lu_attr *la, struct linkea_data *data) { - int rc; + int rc; - rc = mdo_declare_index_insert(env, p, mdo2fid(c), name->ln_name,handle); - if (rc) + rc = mdo_declare_index_insert(env, p, mdo2fid(c), mdd_object_type(c), + name->ln_name, handle); + if (rc != 0) return rc; rc = mdo_declare_ref_add(env, c, handle); @@ -1297,7 +1327,7 @@ static int mdd_link(const struct lu_env *env, struct md_object *tgt_obj, rc = __mdd_index_insert_only(env, mdd_tobj, mdo2fid(mdd_sobj), - name, handle, + mdd_object_type(mdd_sobj), name, handle, mdd_object_capa(env, mdd_tobj)); if (rc != 0) { mdo_ref_del(env, mdd_sobj, handle); @@ -1604,6 +1634,7 @@ static int mdd_unlink(const struct lu_env *env, struct md_object *pobj, if (rc != 0) { __mdd_index_insert_only(env, mdd_pobj, mdo2fid(mdd_cobj), + mdd_object_type(mdd_cobj), name, handle, mdd_object_capa(env, mdd_pobj)); GOTO(cleanup, rc); @@ -1779,7 +1810,7 @@ static int mdd_declare_object_initialize(const struct lu_env *env, struct lu_attr *attr, struct thandle *handle) { - int rc; + int rc; ENTRY; /* @@ -1794,13 +1825,13 @@ static int mdd_declare_object_initialize(const struct lu_env *env, attr->la_valid |= LA_MODE | LA_TYPE; if (rc == 0 && S_ISDIR(attr->la_mode)) { rc = mdo_declare_index_insert(env, child, mdo2fid(child), - dot, handle); - if (rc == 0) - rc = mdo_declare_ref_add(env, child, handle); + S_IFDIR, dot, handle); + if (rc == 0) + rc = mdo_declare_ref_add(env, child, handle); rc = mdo_declare_index_insert(env, child, mdo2fid(parent), - dotdot, handle); - } + S_IFDIR, dotdot, handle); + } RETURN(rc); } @@ -1828,19 +1859,35 @@ static int mdd_object_initialize(const struct lu_env *env, /* Add "." and ".." for newly created dir */ mdo_ref_add(env, child, handle); rc = __mdd_index_insert_only(env, child, mdo2fid(child), - dot, handle, BYPASS_CAPA); - if (rc == 0) - rc = __mdd_index_insert_only(env, child, pfid, - dotdot, handle, - BYPASS_CAPA); - if (rc != 0) - mdo_ref_del(env, child, handle); - } + S_IFDIR, dot, handle, BYPASS_CAPA); + if (rc == 0) + rc = __mdd_index_insert_only(env, child, pfid, S_IFDIR, + dotdot, handle, + BYPASS_CAPA); + if (rc != 0) + mdo_ref_del(env, child, handle); + } RETURN(rc); } -/* has not lock on pobj yet */ +/** + * This function checks whether it can create a file/dir under the + * directory(@pobj). The directory(@pobj) is not being locked by + * mdd lock. + * + * \param[in] env execution environment + * \param[in] pobj the directory to create files + * \param[in] pattr the attributes of the directory + * \param[in] lname the name of the created file/dir + * \param[in] cattr the attributes of the file/dir + * \param[in] spec create specification + * + * \retval = 0 it is allowed to create file/dir under + * the directory + * \retval negative error not allowed to create file/dir + * under the directory + */ static int mdd_create_sanity_check(const struct lu_env *env, struct md_object *pobj, const struct lu_attr *pattr, @@ -1852,6 +1899,7 @@ static int mdd_create_sanity_check(const struct lu_env *env, struct lu_fid *fid = &info->mti_fid; struct mdd_object *obj = md2mdd_obj(pobj); struct mdd_device *m = mdo2mdd(pobj); + bool check_perm = true; int rc; ENTRY; @@ -1872,14 +1920,17 @@ static int mdd_create_sanity_check(const struct lu_env *env, */ rc = __mdd_lookup(env, pobj, pattr, lname, fid, MAY_WRITE | MAY_EXEC); - if (rc != -ENOENT) - RETURN(rc ? : -EEXIST); - } else { - rc = mdd_may_create(env, obj, pattr, NULL, true, false); - if (rc != 0) - RETURN(rc); + if (rc != -ENOENT) + RETURN(rc ? : -EEXIST); + + /* Permission is already being checked in mdd_lookup */ + check_perm = false; } + rc = mdd_may_create(env, obj, pattr, NULL, check_perm); + if (rc != 0) + RETURN(rc); + /* sgid check */ if (pattr->la_mode & S_ISGID) { cattr->la_gid = pattr->la_gid; @@ -2011,17 +2062,18 @@ static int mdd_declare_create(const struct lu_env *env, struct mdd_device *mdd, GOTO(out, rc); } - if (spec->sp_cr_flags & MDS_OPEN_VOLATILE) { + if (unlikely(spec->sp_cr_flags & MDS_OPEN_VOLATILE)) { rc = orph_declare_index_insert(env, c, attr->la_mode, handle); if (rc) GOTO(out, rc); } else { struct lu_attr *la = &mdd_env_info(env)->mti_la_for_fix; - rc = mdo_declare_index_insert(env, p, mdo2fid(c), name->ln_name, - handle); - if (rc) + rc = mdo_declare_index_insert(env, p, mdo2fid(c), attr->la_mode, + name->ln_name, handle); + if (rc != 0) return rc; + rc = mdd_declare_links_add(env, c, handle, ldata); if (rc) return rc; @@ -2031,11 +2083,11 @@ static int mdd_declare_create(const struct lu_env *env, struct mdd_device *mdd, rc = mdo_declare_attr_set(env, p, la, handle); if (rc) return rc; - } - rc = mdd_declare_changelog_store(env, mdd, name, handle); - if (rc) - return rc; + rc = mdd_declare_changelog_store(env, mdd, name, handle); + if (rc) + return rc; + } /* XXX: For remote create, it should indicate the remote RPC * will be sent after local transaction is finished, which @@ -2314,12 +2366,10 @@ static int mdd_create(const struct lu_env *env, struct md_object *pobj, if (unlikely(spec->sp_cr_flags & MDS_OPEN_VOLATILE)) { mdd_write_lock(env, son, MOR_TGT_CHILD); rc = __mdd_orphan_add(env, son, handle); - mdd_write_unlock(env, son); - if (rc != 0) - GOTO(err_created, rc); + GOTO(out_volatile, rc); } else { rc = __mdd_index_insert(env, mdd_pobj, mdo2fid(son), - name, S_ISDIR(attr->la_mode), handle, + attr->la_mode, name, handle, mdd_object_capa(env, mdd_pobj)); if (rc != 0) GOTO(err_created, rc); @@ -2353,29 +2403,37 @@ err_created: mdd_write_lock(env, son, MOR_TGT_CHILD); if (S_ISDIR(attr->la_mode)) { /* Drop the reference, no need to delete "."/"..", - * because the object to be destroied directly. */ + * because the object is to be destroyed directly. */ rc2 = mdo_ref_del(env, son, handle); if (rc2 != 0) { mdd_write_unlock(env, son); goto out_stop; } } +out_volatile: + /* For volatile files drop one link immediately, since there is + * no filename in the namespace, and save any error returned. */ rc2 = mdo_ref_del(env, son, handle); if (rc2 != 0) { mdd_write_unlock(env, son); + if (unlikely(rc == 0)) + rc = rc2; goto out_stop; } - mdo_destroy(env, son, handle); + /* Don't destroy the volatile object on success */ + if (likely(rc != 0)) + mdo_destroy(env, son, handle); mdd_write_unlock(env, son); - } + } - if (rc == 0 && fid_is_namespace_visible(mdo2fid(son))) + if (rc == 0 && fid_is_namespace_visible(mdo2fid(son)) && + likely((spec->sp_cr_flags & MDS_OPEN_VOLATILE) == 0)) rc = mdd_changelog_ns_store(env, mdd, - S_ISDIR(attr->la_mode) ? CL_MKDIR : - S_ISREG(attr->la_mode) ? CL_CREATE : - S_ISLNK(attr->la_mode) ? CL_SOFTLINK : CL_MKNOD, - 0, son, mdd_pobj, lname, handle); + S_ISDIR(attr->la_mode) ? CL_MKDIR : + S_ISREG(attr->la_mode) ? CL_CREATE : + S_ISLNK(attr->la_mode) ? CL_SOFTLINK : CL_MKNOD, + 0, son, mdd_pobj, lname, handle); out_stop: rc2 = mdd_trans_stop(env, mdd, rc, handle); if (rc == 0) @@ -2385,11 +2443,11 @@ out_free: /* if we vmalloced a large buffer drop it */ lu_buf_free(ldata->ld_buf); - /* The child object shouldn't be cached anymore */ - if (rc) + /* The child object shouldn't be cached anymore */ + if (rc) set_bit(LU_OBJECT_HEARD_BANSHEE, - &child->mo_lu.lo_header->loh_flags); - return rc; + &child->mo_lu.lo_header->loh_flags); + return rc; } /* @@ -2463,9 +2521,9 @@ static int mdd_rename_sanity_check(const struct lu_env *env, * processed in cld_rename before mdd_rename and enable * MDS_PERM_BYPASS). * So check may_create, but not check may_unlink. */ - if (!tobj) + if (tobj == NULL) rc = mdd_may_create(env, tgt_pobj, tpattr, NULL, - (src_pobj != tgt_pobj), false); + (src_pobj != tgt_pobj)); else rc = mdd_may_delete(env, tgt_pobj, tpattr, tobj, tattr, cattr, (src_pobj != tgt_pobj), 1); @@ -2513,21 +2571,22 @@ static int mdd_declare_rename(const struct lu_env *env, if (mdd_spobj != mdd_tpobj) { rc = mdo_declare_index_delete(env, mdd_sobj, dotdot, handle); - if (rc) + if (rc != 0) return rc; rc = mdo_declare_index_insert(env, mdd_sobj, mdo2fid(mdd_tpobj), - dotdot, handle); - if (rc) + S_IFDIR, dotdot, handle); + if (rc != 0) return rc; } - /* new target child can be directory, - * counted by target dir's nlink */ - rc = mdo_declare_ref_add(env, mdd_tpobj, handle); - if (rc) - return rc; - } + + /* new target child can be directory, + * counted by target dir's nlink */ + rc = mdo_declare_ref_add(env, mdd_tpobj, handle); + if (rc != 0) + return rc; + } la->la_valid = LA_CTIME | LA_MTIME; rc = mdo_declare_attr_set(env, mdd_spobj, la, handle); @@ -2547,11 +2606,12 @@ static int mdd_declare_rename(const struct lu_env *env, if (rc) return rc; - /* new name */ - rc = mdo_declare_index_insert(env, mdd_tpobj, mdo2fid(mdd_sobj), - tname->ln_name, handle); - if (rc) - return rc; + /* new name */ + rc = mdo_declare_index_insert(env, mdd_tpobj, mdo2fid(mdd_sobj), + mdd_object_type(mdd_sobj), + tname->ln_name, handle); + if (rc != 0) + return rc; /* name from target dir (old name), we declare it unconditionally * as mdd_rename() calls delete unconditionally as well. so just @@ -2691,12 +2751,13 @@ static int mdd_rename(const struct lu_env *env, if (is_dir && mdd_sobj && !lu_fid_eq(spobj_fid, tpobj_fid)) { rc = __mdd_index_delete_only(env, mdd_sobj, dotdot, handle, mdd_object_capa(env, mdd_sobj)); - if (rc) - GOTO(fixup_spobj2, rc); + if (rc != 0) + GOTO(fixup_spobj2, rc); - rc = __mdd_index_insert_only(env, mdd_sobj, tpobj_fid, dotdot, - handle, mdd_object_capa(env, mdd_sobj)); - if (rc) + rc = __mdd_index_insert_only(env, mdd_sobj, tpobj_fid, S_IFDIR, + dotdot, handle, + mdd_object_capa(env, mdd_sobj)); + if (rc != 0) GOTO(fixup_spobj, rc); } @@ -2716,9 +2777,9 @@ static int mdd_rename(const struct lu_env *env, } /* Insert new fid with target name into target dir */ - rc = __mdd_index_insert(env, mdd_tpobj, lf, tname, is_dir, handle, - mdd_object_capa(env, mdd_tpobj)); - if (rc) + rc = __mdd_index_insert(env, mdd_tpobj, lf, cattr->la_mode, + tname, handle, mdd_object_capa(env, mdd_tpobj)); + if (rc != 0) GOTO(fixup_tpobj, rc); LASSERT(ma->ma_attr.la_valid & LA_CTIME); @@ -2848,15 +2909,14 @@ fixup_tpobj: mdo_ref_add(env, mdd_tobj, handle); } - rc2 = __mdd_index_insert(env, mdd_tpobj, - mdo2fid(mdd_tobj), tname, - is_dir, handle, - BYPASS_CAPA); - - if (rc2) - CWARN("tp obj fix error %d\n",rc2); - } - } + rc2 = __mdd_index_insert(env, mdd_tpobj, + mdo2fid(mdd_tobj), + mdd_object_type(mdd_tobj), + tname, handle, BYPASS_CAPA); + if (rc2 != 0) + CWARN("tp obj fix error: rc = %d\n", rc2); + } + } fixup_spobj: if (rc && is_dir && mdd_sobj && mdd_spobj != mdd_tpobj) { @@ -2868,32 +2928,36 @@ fixup_spobj: mdd2obd_dev(mdd)->obd_name, rc2); - rc2 = __mdd_index_insert_only(env, mdd_sobj, spobj_fid, + rc2 = __mdd_index_insert_only(env, mdd_sobj, spobj_fid, S_IFDIR, dotdot, handle, BYPASS_CAPA); - if (rc2) + if (rc2 != 0) CWARN("%s: sp obj dotdot insert error: rc = %d\n", mdd2obd_dev(mdd)->obd_name, rc2); } fixup_spobj2: - if (rc) { - rc2 = __mdd_index_insert(env, mdd_spobj, - lf, sname, is_dir, handle, BYPASS_CAPA); - if (rc2) - CWARN("sp obj fix error %d\n",rc2); - } + if (rc != 0) { + rc2 = __mdd_index_insert(env, mdd_spobj, lf, + mdd_object_type(mdd_sobj), sname, + handle, BYPASS_CAPA); + if (rc2 != 0) + CWARN("sp obj fix error: rc = %d\n", rc2); + } + cleanup: if (tobj_locked) mdd_write_unlock(env, mdd_tobj); + cleanup_unlocked: - if (rc == 0) + if (rc == 0) rc = mdd_changelog_ext_ns_store(env, mdd, CL_RENAME, cl_flags, mdd_tobj, tpobj_fid, lf, spobj_fid, ltname, lsname, handle); stop: - mdd_trans_stop(env, mdd, rc, handle); + mdd_trans_stop(env, mdd, rc, handle); + out_pending: mdd_object_put(env, mdd_sobj); return rc; @@ -3060,13 +3124,14 @@ static int mdd_update_linkea_internal(const struct lu_env *env, /* Insert new fid with target name into target dir */ rc = mdo_declare_index_delete(env, pobj, lname.ln_name, handle); - if (rc) + if (rc != 0) GOTO(next_put, rc); rc = mdo_declare_index_insert(env, pobj, - mdd_object_fid(mdd_tobj), - lname.ln_name, handle); - if (rc) + mdd_object_fid(mdd_tobj), + mdd_object_type(mdd_tobj), + lname.ln_name, handle); + if (rc != 0) GOTO(next_put, rc); rc = mdo_declare_ref_add(env, mdd_tobj, handle); @@ -3084,10 +3149,11 @@ static int mdd_update_linkea_internal(const struct lu_env *env, GOTO(next_put, rc); rc = __mdd_index_insert(env, pobj, - mdd_object_fid(mdd_tobj), - lname.ln_name, 0, handle, - mdd_object_capa(env, pobj)); - if (rc) + mdd_object_fid(mdd_tobj), + mdd_object_type(mdd_tobj), + lname.ln_name, handle, + mdd_object_capa(env, pobj)); + if (rc != 0) GOTO(next_put, rc); mdd_write_lock(env, mdd_tobj, MOR_SRC_CHILD); @@ -3327,11 +3393,11 @@ static int mdd_migrate_create(const struct lu_env *env, } mgr_ea = (struct lmv_mds_md_v1 *)info->mti_xattr_buf; + memset(mgr_ea, 0, sizeof(mgr_ea)); mgr_ea->lmv_magic = cpu_to_le32(LMV_MAGIC_V1); mgr_ea->lmv_stripe_count = cpu_to_le32(2); mgr_ea->lmv_master_mdt_index = mdd_seq_site(mdd)->ss_node_id; mgr_ea->lmv_hash_type = cpu_to_le32(LMV_HASH_FLAG_MIGRATION); - fid_cpu_to_le(&mgr_ea->lmv_master_fid, mdd_object_fid(mdd_sobj)); fid_cpu_to_le(&mgr_ea->lmv_stripe_fids[0], mdd_object_fid(mdd_sobj)); fid_cpu_to_le(&mgr_ea->lmv_stripe_fids[1], mdd_object_fid(mdd_tobj)); @@ -3467,7 +3533,7 @@ static int mdd_migrate_entries(const struct lu_env *env, if (IS_ERR(child)) GOTO(out, rc = PTR_ERR(child)); - is_dir = S_ISDIR(lu_object_attr(&child->mod_obj.mo_lu)); + is_dir = S_ISDIR(mdd_object_type(child)); snprintf(name, ent->lde_namelen + 1, "%s", ent->lde_name); @@ -3494,6 +3560,7 @@ static int mdd_migrate_entries(const struct lu_env *env, if (likely(!target_exist)) { rc = mdo_declare_index_insert(env, mdd_tobj, &ent->lde_fid, + mdd_object_type(child), name, handle); if (rc != 0) GOTO(out_put, rc); @@ -3522,7 +3589,7 @@ static int mdd_migrate_entries(const struct lu_env *env, rc = mdo_declare_index_insert(env, child, mdd_object_fid(mdd_tobj), - dotdot, handle); + S_IFDIR, dotdot, handle); if (rc != 0) GOTO(out_put, rc); } @@ -3543,7 +3610,8 @@ static int mdd_migrate_entries(const struct lu_env *env, if (likely(!target_exist)) { rc = __mdd_index_insert(env, mdd_tobj, &ent->lde_fid, - name, is_dir, handle, + mdd_object_type(child), + name, handle, mdd_object_capa(env, mdd_tobj)); if (rc != 0) GOTO(out_put, rc); @@ -3568,7 +3636,7 @@ static int mdd_migrate_entries(const struct lu_env *env, GOTO(out_put, rc); rc = __mdd_index_insert_only(env, child, - mdd_object_fid(mdd_tobj), + mdd_object_fid(mdd_tobj), S_IFDIR, dotdot, handle, mdd_object_capa(env, child)); if (rc != 0) @@ -3666,6 +3734,7 @@ static int mdd_declare_migrate_update_name(const struct lu_env *env, /* new name */ rc = mdo_declare_index_insert(env, mdd_pobj, mdo2fid(mdd_tobj), + mdd_object_type(mdd_tobj), lname->ln_name, handle); if (rc != 0) return rc; @@ -3782,8 +3851,9 @@ static int mdd_migrate_update_name(const struct lu_env *env, } /* Insert new fid with target name into target dir */ - rc = __mdd_index_insert(env, mdd_pobj, mdd_object_fid(mdd_tobj), name, - is_dir, handle, mdd_object_capa(env, mdd_pobj)); + rc = __mdd_index_insert(env, mdd_pobj, mdd_object_fid(mdd_tobj), + mdd_object_type(mdd_tobj), name, + handle, mdd_object_capa(env, mdd_pobj)); if (rc != 0) GOTO(stop_trans, rc);