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

Hit ASSERTION(attr->la_blocks == 0), see bug 22802.

This reverts commit 33b4bafea13bd2cfe90dba3a8651a175683f3999.

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index 388780e..b178527 100644 (file)
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -745,7 +745,7 @@ static int obf_attr_get(const struct lu_env *env, struct md_object *obj,
 
                 if (ma->ma_need & MA_LOV_DEF) {
                         rc = mdd_get_default_md(mdd_obj, ma->ma_lmm,
 
                 if (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;
                         if (rc > 0) {
                                 ma->ma_valid |= MA_LOV;
                                 rc = 0;

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);
 
         ldesc = &mdd->mdd_obd_dev->u.mds.mds_lov_desc;
         LASSERT(ldesc != NULL);

-        LASSERT(size != NULL);

 
 

-        if (!lmm) {
-                *size = 0;
+        if (!lmm)

                 RETURN(0);
                 RETURN(0);

-        }

 
         lmm->lmm_magic = LOV_MAGIC_V1;
         lmm->lmm_object_gr = LOV_OBJECT_GROUP_DEFAULT;
 
         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);
 
         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,
                 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;
         if (rc > 0) {
                 ma->ma_valid |= MA_LOV;
                 rc = 0;

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 6c63afd..21ac436 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -402,23 +402,18 @@ void mdt_pack_attr2body(struct mdt_thread_info *info, struct mdt_body *b,
 {
         struct md_attr          *ma  = &info->mti_attr;
 
 {
         struct md_attr          *ma  = &info->mti_attr;
 

-        LASSERT(ma->ma_valid & MA_INODE);
-

         /*XXX should pack the reply body according to lu_valid*/
         b->valid |= OBD_MD_FLCTIME | OBD_MD_FLUID   |
                     OBD_MD_FLGID   | OBD_MD_FLTYPE  |
                     OBD_MD_FLMODE  | OBD_MD_FLNLINK | OBD_MD_FLFLAGS |
                     OBD_MD_FLATIME | OBD_MD_FLMTIME ;
 
         /*XXX should pack the reply body according to lu_valid*/
         b->valid |= OBD_MD_FLCTIME | OBD_MD_FLUID   |
                     OBD_MD_FLGID   | OBD_MD_FLTYPE  |
                     OBD_MD_FLMODE  | OBD_MD_FLNLINK | OBD_MD_FLFLAGS |
                     OBD_MD_FLATIME | OBD_MD_FLMTIME ;
 

-        if (!S_ISREG(attr->la_mode)) {
+        if (!S_ISREG(attr->la_mode))

                 b->valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS | OBD_MD_FLRDEV;
                 b->valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS | OBD_MD_FLRDEV;

-        } else if (ma->ma_need & MA_LOV && ma->ma_lmm_size == 0) {
-                /* means no objects are allocated on osts. */
-                LASSERT(!(ma->ma_valid & MA_LOV));
-                LASSERT(attr->la_blocks == 0);
-                /* if no object is allocated on osts, the size on mds is valid. b=22272 */
-                b->valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
-        }
+
+        /* if no object is allocated on osts, the size on mds is valid. b=22272 */
+        if (ma->ma_lmm_size == 0)
+                b->valid |= OBD_MD_FLSIZE;

 
         b->atime      = attr->la_atime;
         b->mtime      = attr->la_mtime;
 
         b->atime      = attr->la_atime;
         b->mtime      = attr->la_mtime;

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index 801925a..f91fa02 100644 (file)
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -1661,13 +1661,13 @@ int mdt_done_writing(struct mdt_thread_info *info)
         info->mti_attr.ma_valid = 0;
 
         info->mti_attr.ma_lmm_size = info->mti_mdt->mdt_max_mdsize;
         info->mti_attr.ma_valid = 0;
 
         info->mti_attr.ma_lmm_size = info->mti_mdt->mdt_max_mdsize;

-        OBD_ALLOC(info->mti_attr.ma_lmm, info->mti_mdt->mdt_max_mdsize);
+        OBD_ALLOC(info->mti_attr.ma_lmm, info->mti_attr.ma_lmm_size);

         if (info->mti_attr.ma_lmm == NULL)
                 RETURN(-ENOMEM);
 
         rc = mdt_mfd_close(info, mfd);
 
         if (info->mti_attr.ma_lmm == NULL)
                 RETURN(-ENOMEM);
 
         rc = mdt_mfd_close(info, mfd);
 

-        OBD_FREE(info->mti_attr.ma_lmm, info->mti_mdt->mdt_max_mdsize);
+        OBD_FREE(info->mti_attr.ma_lmm, info->mti_attr.ma_lmm_size);

         mdt_empty_transno(info);
         RETURN(rc);
 }
         mdt_empty_transno(info);
         RETURN(rc);
 }

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index 3ffd2e6..56222c2 100644 (file)
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -557,13 +557,13 @@ static int mdt_reint_setattr(struct mdt_thread_info *info,
 
                 /* Close the found mfd, update attributes. */
                 ma->ma_lmm_size = info->mti_mdt->mdt_max_mdsize;
 
                 /* Close the found mfd, update attributes. */
                 ma->ma_lmm_size = info->mti_mdt->mdt_max_mdsize;

-                OBD_ALLOC(ma->ma_lmm, info->mti_mdt->mdt_max_mdsize);
+                OBD_ALLOC(ma->ma_lmm, ma->ma_lmm_size);

                 if (ma->ma_lmm == NULL)
                         GOTO(out_put, rc = -ENOMEM);
 
                 mdt_mfd_close(info, mfd);
 
                 if (ma->ma_lmm == NULL)
                         GOTO(out_put, rc = -ENOMEM);
 
                 mdt_mfd_close(info, mfd);
 

-                OBD_FREE(ma->ma_lmm, info->mti_mdt->mdt_max_mdsize);
+                OBD_FREE(ma->ma_lmm, ma->ma_lmm_size);

         } else {
                 rc = mdt_attr_set(info, mo, ma, rr->rr_flags);
                 if (rc)
         } else {
                 rc = mdt_attr_set(info, mo, ma, rr->rr_flags);
                 if (rc)