modified open handling, return lov ea to client.

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 8a9d1af..a759d89 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -588,7 +588,7 @@ struct lov_mds_md_v1 {            /* LOV EA mds/wire data (little-endian) */
         struct lov_ost_data_v1 lmm_objects[0]; /* per-stripe data */
 };
 
-#define MAX_MD_SIZE (sizeof(struct lov_mds_md) + 2 * sizeof(struct lov_ost_data))
+#define MAX_MD_SIZE (sizeof(struct lov_mds_md) + 16 * sizeof(struct lov_ost_data))
 
 #define OBD_MD_FLID        (0x00000001ULL) /* object ID */
 #define OBD_MD_FLATIME     (0x00000002ULL) /* access time */

diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c
index 689702d..aa00a0a 100644 (file)
--- a/lustre/mdd/mdd_handler.c
+++ b/lustre/mdd/mdd_handler.c
@@ -385,8 +385,11 @@ static int __mdd_object_create(const struct lu_context *ctxt,
         if (!lu_object_exists(ctxt, mdd2lu_obj(obj))) {
                 next = mdd_object_child(obj);
                 rc = next->do_ops->do_create(ctxt, next, attr, handle);
-                if (rc == 0)
-                        mdd_attr_get(ctxt, &obj->mod_obj, &ma->ma_attr);
+                if (rc == 0) {
+                        rc = mdd_attr_get(ctxt, &obj->mod_obj, &ma->ma_attr);
+                        if (rc == 0)
+                                ma->ma_valid |= MA_INODE;
+                }
         } else
                 rc = -EEXIST;
 
@@ -870,6 +873,12 @@ static int mdd_create(const struct lu_context *ctxt, struct md_object *pobj,
                 rc = mdd_lov_create(ctxt, mdd, son, &lmm, &lmm_size);
                 if (rc)
                         RETURN(rc);
+                if (lmm_size < ma->ma_lmm_size)
+                        ma->ma_lmm_size = lmm_size;
+                if (ma->ma_lmm_size > 0) {
+                        memcpy(ma->ma_lmm, lmm, ma->ma_lmm_size);
+                        ma->ma_valid |= MA_LOV;
+                }
         }
 
         mdd_txn_param_build(ctxt, &MDD_TXN_MKDIR);
@@ -960,7 +969,8 @@ cleanup:
                 if (rc2 == 0)
                         __mdd_ref_del(ctxt, son, handle, NULL);
         }
-
+        if (lmm)
+                OBD_FREE(lmm, lmm_size);
         mdd_unlock(ctxt, mdo, DT_WRITE_LOCK);
         mdd_trans_stop(ctxt, mdd, handle);
         RETURN(rc);
@@ -1113,8 +1123,11 @@ __mdd_ref_del(const struct lu_context *ctxt, struct mdd_object *obj,
         LASSERT(lu_object_exists(ctxt, mdd2lu_obj(obj)));
 
         next->do_ops->do_ref_del(ctxt, next, handle);
-        if (ma != NULL)
-                mdd_attr_get(ctxt, &obj->mod_obj, &ma->ma_attr);
+        if (ma != NULL) {
+                int rc = mdd_attr_get(ctxt, &obj->mod_obj, &ma->ma_attr);
+                if (rc == 0)
+                        ma->ma_valid |= MA_INODE;
+        }
 }
 
 static int mdd_ref_del(const struct lu_context *ctxt, struct md_object *obj,

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index 29cdc71..703a4f4 100644 (file)
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -73,33 +73,47 @@ static void mdt_mfd_free(struct mdt_file_data *mfd)
 
 static int mdt_mfd_open(struct mdt_thread_info *info,
                         struct mdt_object *o, 
-                        int flags)
+                        int flags, int created)
 {
         struct mdt_export_data *med;
         struct mdt_file_data   *mfd;
         struct mdt_body        *repbody;
-        struct lov_mds_md      *lmm = NULL;
-        struct lu_attr         *attr = &info->mti_attr.ma_attr;
+        struct md_attr         *ma = &info->mti_attr;
+        struct lu_attr         *la = &ma->ma_attr;
         struct ptlrpc_request  *req = mdt_info_req(info);
         int                     rc = 0;
         ENTRY;
 
         med = &req->rq_export->exp_mdt_data;
         repbody = req_capsule_server_get(&info->mti_pill, &RMF_MDT_BODY);
-        if (req_capsule_has_field(&info->mti_pill, &RMF_MDT_MD))
-                lmm = req_capsule_server_get(&info->mti_pill, &RMF_MDT_MD);
 
-        rc = mo_attr_get(info->mti_ctxt, mdt_object_child(o), attr);
-        if (rc == 0) {
-                if (!S_ISREG(attr->la_mode) &&
-                    !S_ISDIR(attr->la_mode) &&
+        if (!created) {
+                /* we have to get attr & lov ea for this object*/
+                rc = mo_attr_get(info->mti_ctxt, mdt_object_child(o), la);
+                if (rc == 0 && S_ISREG(la->la_mode)) {
+                        ma->ma_valid |= MA_INODE;
+                        rc = mo_xattr_get(info->mti_ctxt, 
+                                          mdt_object_child(o),
+                                          ma->ma_lmm, 
+                                          ma->ma_lmm_size,
+                                          XATTR_NAME_LOV);
+                        if (rc >= 0) {
+                                ma->ma_lmm_size = rc;
+                                rc = 0;
+                                ma->ma_valid |= MA_LOV;
+                        }
+                }
+        }
+        if (rc == 0){
+                if (!S_ISREG(la->la_mode) &&
+                    !S_ISDIR(la->la_mode) &&
                      (req->rq_export->exp_connect_flags & OBD_CONNECT_NODEVOH))
                         /* If client supports this, do not return open handle
                         *  for special device nodes */
                         RETURN(0);
 
                 /* FIXME:maybe this can be done earlier? */
-                if (S_ISDIR(attr->la_mode)) {
+                if (S_ISDIR(la->la_mode)) {
                         if (flags & (MDS_OPEN_CREAT | FMODE_WRITE)) {
                                 /* we are trying to create or 
                                  * write an existing dir. */
@@ -108,31 +122,19 @@ static int mdt_mfd_open(struct mdt_thread_info *info,
                 } else if (flags & MDS_OPEN_DIRECTORY) 
                         rc = -ENOTDIR;
         }
-        if (rc != 0) {
-                if (rc == -EREMOTE) {
-                        repbody->fid1 = *mdt_object_fid(o);
-                        repbody->valid |= OBD_MD_FLID;
-                }
+        if (rc != 0)
                 RETURN(rc);
-        }
-
-        mdt_pack_attr2body(repbody, attr, mdt_object_fid(o));
-
-/*
-        if (lmm) {
-                rc = mo_xattr_get(info->mti_ctxt, mdt_object_child(o),
-                                  lmm, info->mti_mdt->mdt_max_mdsize, 
-                                  XATTR_NAME_LOV);
-                if (rc < 0)
-                        RETURN(-EINVAL);
-                if (S_ISDIR(attr->la_mode))
+        if (ma->ma_valid & MA_INODE)
+                mdt_pack_attr2body(repbody, la, mdt_object_fid(o));
+        if (ma->ma_lmm_size && ma->ma_valid & MA_LOV) {
+                CERROR("LOVLOV size = %d\n", ma->ma_lmm_size);
+                repbody->eadatasize = ma->ma_lmm_size;
+                if (S_ISDIR(la->la_mode))
                         repbody->valid |= OBD_MD_FLDIREA;
                 else
                         repbody->valid |= OBD_MD_FLEASIZE;
-                repbody->eadatasize = rc;
-                rc = 0;
         }
-*/
+
         if (flags & FMODE_WRITE) {
                 /*mds_get_write_access*/
         } else if (flags & MDS_FMODE_EXEC) {
@@ -164,15 +166,27 @@ int mdt_open_by_fid(struct mdt_thread_info* info, const struct lu_fid *fid,
                     __u32 flags)
 {
         struct mdt_object *o;
-        int rc;
+        struct lu_attr    *la = &info->mti_attr.ma_attr;
+        int                rc;
         ENTRY;
 
         o = mdt_object_find(info->mti_ctxt, info->mti_mdt, fid);
         if (!IS_ERR(o)) {
                 if (mdt_object_exists(info->mti_ctxt, &o->mot_obj.mo_lu)) {
-                        rc = mdt_mfd_open(info, o, flags);
+                        if (la->la_flags & MDS_OPEN_EXCL &&
+                            la->la_flags & MDS_OPEN_CREAT)
+                                rc = -EEXIST;
+                        else 
+                                rc = mdt_mfd_open(info, o, flags, 0);
                 } else {
                         rc = -ENOENT;
+                        if (la->la_flags & MDS_OPEN_CREAT) {
+                                rc = mo_object_create(info->mti_ctxt, 
+                                                      mdt_object_child(o),
+                                                      &info->mti_attr);
+                                if (rc == 0)
+                                        rc = mdt_mfd_open(info, o, flags, 1);
+                        }
                 }
                 mdt_object_put(info->mti_ctxt, o);
         } else
@@ -230,15 +244,22 @@ int mdt_reint_open(struct mdt_thread_info *info)
         struct mdt_lock_handle *lh;
         struct ldlm_reply      *ldlm_rep;
         struct lu_fid          *child_fid = &info->mti_tmp_fid1;
-        struct lu_attr         *attr = &info->mti_attr.ma_attr;
+        struct md_attr         *ma = &info->mti_attr;
+        struct lu_attr         *la = &ma->ma_attr;
         int                     result;
         int                     created = 0;
         struct mdt_reint_record *rr = &info->mti_rr;
         ENTRY;
+        
+        ma->ma_lmm = req_capsule_server_get(&info->mti_pill,
+                                            &RMF_MDT_MD);
+        ma->ma_lmm_size = req_capsule_get_size(&info->mti_pill,
+                                               &RMF_MDT_MD,
+                                               RCL_SERVER);
 
         if (strlen(rr->rr_name) == 0) {
                 /* reint partial remote open */
-                RETURN(mdt_open_by_fid(info, rr->rr_fid1, attr->la_flags));
+                RETURN(mdt_open_by_fid(info, rr->rr_fid1, la->la_flags));
         }
 
         /* we now have no resent message, so it must be an intent */
@@ -266,13 +287,13 @@ int mdt_reint_open(struct mdt_thread_info *info)
 
         if (result == -ENOENT) {
                 intent_set_disposition(ldlm_rep, DISP_LOOKUP_NEG);
-                if (!(attr->la_flags & MDS_OPEN_CREAT))
+                if (!(la->la_flags & MDS_OPEN_CREAT))
                         GOTO(out_parent, result);
                 *child_fid = *info->mti_rr.rr_fid2;
         } else {
                 intent_set_disposition(ldlm_rep, DISP_LOOKUP_POS);
-                if (attr->la_flags & MDS_OPEN_EXCL &&
-                    attr->la_flags & MDS_OPEN_CREAT)
+                if (la->la_flags & MDS_OPEN_EXCL &&
+                    la->la_flags & MDS_OPEN_CREAT)
                         GOTO(out_parent, result = -EEXIST);
         }
 
@@ -295,7 +316,7 @@ int mdt_reint_open(struct mdt_thread_info *info)
         }
 
         /* Open it now. */
-        result = mdt_mfd_open(info, child, attr->la_flags);
+        result = mdt_mfd_open(info, child, la->la_flags, created);
         intent_set_disposition(ldlm_rep, DISP_OPEN_OPEN);
         GOTO(finish_open, result);
 

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index 893bff4..05bd2b4 100644 (file)
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -44,7 +44,7 @@ static int mdt_md_create(struct mdt_thread_info *info)
         struct mdt_object      *child;
         struct mdt_lock_handle *lh;
         struct mdt_body        *repbody;
-        struct lu_attr         *attr = &info->mti_attr.ma_attr;
+        struct md_attr         *ma = &info->mti_attr;
         struct mdt_reint_record *rr = &info->mti_rr;
         int rc;
         ENTRY;
@@ -64,23 +64,12 @@ static int mdt_md_create(struct mdt_thread_info *info)
                 struct md_object *next = mdt_object_child(parent);
 
                 rc = mdo_create(info->mti_ctxt, next, rr->rr_name,
-                                mdt_object_child(child), rr->rr_tgt, &info->mti_attr);
+                                mdt_object_child(child), rr->rr_tgt, ma);
                 if (rc == 0) {
-                        /* return fid & attr to client. attr is over-written!*/
-                        rc = mo_attr_get(info->mti_ctxt,
-                                         mdt_object_child(child),
-                                         attr);
-                        if (rc == 0) {
-                                /*parent and child are all local. */
-                                mdt_pack_attr2body(repbody, attr,
+                        /* return fid & attr to client. */
+                        if (ma->ma_valid & MA_INODE)
+                                mdt_pack_attr2body(repbody, &ma->ma_attr,
                                                    mdt_object_fid(child));
-                        } else if (rc == -EREMOTE) {
-                                /* parent is local, child is remote. */
-                                /*FIXME: should be return 0 or -EREMOTE? */
-                                /* also in mdt_open:mdt_object_open() */
-                                repbody->fid1 = *mdt_object_fid(child);
-                                repbody->valid |= OBD_MD_FLID;
-                        }
                 }
                 mdt_object_put(info->mti_ctxt, child);
         } else
@@ -95,6 +84,7 @@ static int mdt_md_mkobj(struct mdt_thread_info *info)
         struct mdt_device      *mdt = info->mti_mdt;
         struct mdt_object      *o;
         struct mdt_body        *repbody;
+        struct md_attr         *ma = &info->mti_attr;
         int rc;
         ENTRY;
 
@@ -104,18 +94,12 @@ static int mdt_md_mkobj(struct mdt_thread_info *info)
         if (!IS_ERR(o)) {
                 struct md_object *next = mdt_object_child(o);
 
-                rc = mo_object_create(info->mti_ctxt, next,
-                                      &info->mti_attr);
+                rc = mo_object_create(info->mti_ctxt, next, ma);
                 if (rc == 0) {
-                        /* return fid to client. */
-                        rc = mo_attr_get(info->mti_ctxt,
-                                         next,
-                                         &info->mti_attr.ma_attr);
-                        if (rc == 0) {
-                                mdt_pack_attr2body(repbody,
-                                                   &info->mti_attr.ma_attr,
+                        /* return fid & attr to client. */
+                        if (ma->ma_valid & MA_INODE)
+                                mdt_pack_attr2body(repbody, &ma->ma_attr,
                                                    mdt_object_fid(o));
-                        }
                 }
                 mdt_object_put(info->mti_ctxt, o);
         } else