X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_object.c;h=b58559a050bb21f3e2e97eca1e35ef90d0cb196a;hb=1ebc9ed460922e6fcf2432f70f2f6412974e963a;hp=7de10177b9c90fb97fda43cf6f4a75f327660d60;hpb=40daa59ac41f450b60b42eb2bb0ff42ebd3c998b;p=fs%2Flustre-release.git diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c index 7de1017..b58559a 100644 --- a/lustre/mdd/mdd_object.c +++ b/lustre/mdd/mdd_object.c @@ -3577,18 +3577,12 @@ stop: * no need check again. */ static int mdd_readpage_sanity_check(const struct lu_env *env, - struct mdd_object *obj) + struct mdd_object *obj) { - struct dt_object *next = mdd_object_child(obj); - int rc; - ENTRY; - - if (S_ISDIR(mdd_object_type(obj)) && dt_try_as_dir(env, next)) - rc = 0; - else - rc = -ENOTDIR; + if (!dt_try_as_dir(env, mdd_object_child(obj), true)) + return -ENOTDIR; - RETURN(rc); + return 0; } static int mdd_dir_page_build(const struct lu_env *env, struct dt_object *obj,