Branch:b_new_cmd

add group num when set attr to OST

diff --git a/lustre/mdd/mdd_lov.c b/lustre/mdd/mdd_lov.c
index c267b8d..a435e43 100644 (file)
--- a/lustre/mdd/mdd_lov.c
+++ b/lustre/mdd/mdd_lov.c
@@ -596,14 +596,11 @@ int mdd_lov_setattr_async(const struct lu_env *env, struct mdd_object *obj,
         oc = next->do_ops->do_capa_get(env, next, NULL, CAPA_OPC_MDS_DEFAULT);
         if (IS_ERR(oc))
                 oc = NULL;
-        
-        /* 
-         * Wangdi: please fix this. OST will oops if this is called.
-         */
-/*
+
         rc = mds_osc_setattr_async(obd, tmp_la->la_uid, tmp_la->la_gid, lmm,
-                                   lmm_size, NULL, fid_seq(fid), fid_oid(fid), oc);
-*/
+                                   lmm_size, NULL, fid_seq(fid), fid_oid(fid),
+                                   oc);
+
         capa_put(oc);
 
         RETURN(rc);

diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index 1fede7a..61584ee 100644 (file)
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -446,8 +446,10 @@ int mds_osc_setattr_async(struct obd_device *obd, __u32 uid, __u32 gid,
         /* then fill oa */
         oinfo.oi_oa->o_uid = uid;
         oinfo.oi_oa->o_gid = gid;
-        oinfo.oi_oa->o_valid |= OBD_MD_FLID | OBD_MD_FLUID | OBD_MD_FLGID;
         oinfo.oi_oa->o_id = oinfo.oi_md->lsm_object_id;
+        oinfo.oi_oa->o_gr = oinfo.oi_md->lsm_object_gr;
+        oinfo.oi_oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP | 
+                                OBD_MD_FLUID | OBD_MD_FLGID;
         if (logcookies) {
                 oinfo.oi_oa->o_valid |= OBD_MD_FLCOOKIE;
                 oti.oti_logcookies = logcookies;