X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_dir.c;h=1b836149efaffe6483cbfde300cff2bc5be20c0b;hp=1250bd1a79e80667d21f891555074070929a07c7;hb=1ebc9ed460922e6fcf2432f70f2f6412974e963a;hpb=40daa59ac41f450b60b42eb2bb0ff42ebd3c998b diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c index 1250bd1..1b83614 100644 --- a/lustre/mdd/mdd_dir.c +++ b/lustre/mdd/mdd_dir.c @@ -101,8 +101,7 @@ __mdd_lookup(const struct lu_env *env, struct md_object *pobj, if (rc) RETURN(rc); - if (likely(S_ISDIR(mdd_object_type(mdd_obj)) && - dt_try_as_dir(env, dir))) + if (likely(dt_try_as_dir(env, dir, true))) rc = dt_lookup(env, dir, (struct dt_rec *)fid, key); else rc = -ENOTDIR; @@ -369,7 +368,7 @@ int mdd_dir_is_empty(const struct lu_env *env, struct mdd_object *dir) ENTRY; obj = mdd_object_child(dir); - if (!dt_try_as_dir(env, obj)) + if (!dt_try_as_dir(env, obj, true)) RETURN(-ENOTDIR); iops = &obj->do_index_ops->dio_it; @@ -660,7 +659,7 @@ static int __mdd_index_delete_only(const struct lu_env *env, struct mdd_object * int rc; ENTRY; - if (dt_try_as_dir(env, next)) + if (dt_try_as_dir(env, next, true)) rc = dt_delete(env, next, (struct dt_key *)name, handle); else rc = -ENOTDIR; @@ -677,7 +676,7 @@ static int __mdd_index_insert_only(const struct lu_env *env, int rc; ENTRY; - if (dt_try_as_dir(env, next)) { + if (dt_try_as_dir(env, next, true)) { struct dt_insert_rec *rec = &mdd_env_info(env)->mdi_dt_rec; rec->rec_fid = lf;