Revert "b=22637 MDS returns OBD_MD_FLSIZE to client only when no OSS object allocated"

[fs/lustre-release.git] / lustre / mdd / mdd_object.c

diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c
index 7c37c2f..895120e 100644 (file)
--- a/lustre/mdd/mdd_object.c
+++ b/lustre/mdd/mdd_object.c
@@ -615,12 +615,9 @@ int mdd_get_default_md(struct mdd_object *mdd_obj, struct lov_mds_md *lmm,
 
         ldesc = &mdd->mdd_obd_dev->u.mds.mds_lov_desc;
         LASSERT(ldesc != NULL);
-        LASSERT(size != NULL);
 
-        if (!lmm) {
-                *size = 0;
+        if (!lmm)
                 RETURN(0);
-        }
 
         lmm->lmm_magic = LOV_MAGIC_V1;
         lmm->lmm_object_gr = LOV_OBJECT_GROUP_DEFAULT;
@@ -644,9 +641,12 @@ static int __mdd_lmm_get(const struct lu_env *env,
 
         rc = mdd_get_md(env, mdd_obj, ma->ma_lmm, &ma->ma_lmm_size,
                         XATTR_NAME_LOV);
-        if (rc == 0 && ma->ma_need & MA_LOV_DEF)
+
+        if (rc == 0 && (ma->ma_need & MA_LOV_DEF)) {
                 rc = mdd_get_default_md(mdd_obj, ma->ma_lmm,
-                                        &ma->ma_lmm_size);
+                                &ma->ma_lmm_size);
+        }
+
         if (rc > 0) {
                 ma->ma_valid |= MA_LOV;
                 rc = 0;