X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosp%2Fosp_md_object.c;h=d84a259e24aefebc33723765281d8c8defe60702;hp=a4299e78134ebd02ae8ffcae77f5896aa38d62ae;hb=de2d5808bd2987f76d2486272e1a9c192ba277d4;hpb=0209add4a5099817111c8576afe930d1e2daef03

diff --git a/lustre/osp/osp_md_object.c b/lustre/osp/osp_md_object.c
index a4299e7..d84a259 100644
--- a/lustre/osp/osp_md_object.c
+++ b/lustre/osp/osp_md_object.c
@@ -64,19 +64,16 @@ int osp_md_declare_object_create(const struct lu_env *env,
 	osi->osi_obdo.o_valid = 0;
 	obdo_from_la(&osi->osi_obdo, attr, attr->la_valid);
 	lustre_set_wire_obdo(NULL, &osi->osi_obdo, &osi->osi_obdo);
-	obdo_cpu_to_le(&osi->osi_obdo, &osi->osi_obdo);
 
 	bufs[0] = (char *)&osi->osi_obdo;
 	buf_count = 1;
 	fid1 = (struct lu_fid *)lu_object_fid(&dt->do_lu);
 	if (hint != NULL && hint->dah_parent) {
 		struct lu_fid *fid2;
-		struct lu_fid *tmp_fid = &osi->osi_fid;
 
 		fid2 = (struct lu_fid *)lu_object_fid(&hint->dah_parent->do_lu);
-		fid_cpu_to_le(tmp_fid, fid2);
-		sizes[1] = sizeof(*tmp_fid);
-		bufs[1] = (char *)tmp_fid;
+		sizes[1] = sizeof(*fid2);
+		bufs[1] = (char *)fid2;
 		buf_count++;
 	}
 
@@ -135,8 +132,6 @@ int osp_md_object_create(const struct lu_env *env, struct dt_object *dt,
 			 struct lu_attr *attr, struct dt_allocation_hint *hint,
 			 struct dt_object_format *dof, struct thandle *th)
 {
-	struct osp_object  *obj = dt2osp_obj(dt);
-
 	CDEBUG(D_INFO, "create object "DFID"\n",
 	       PFID(&dt->do_lu.lo_header->loh_fid));
 
@@ -144,7 +139,6 @@ int osp_md_object_create(const struct lu_env *env, struct dt_object *dt,
 	 * if creation reaches here, it means the object has been created
 	 * successfully */
 	dt->do_lu.lo_header->loh_attr |= LOHA_EXISTS | (attr->la_mode & S_IFMT);
-	obj->opo_empty = 1;
 
 	return 0;
 }
@@ -248,7 +242,6 @@ int osp_md_declare_attr_set(const struct lu_env *env, struct dt_object *dt,
 	obdo_from_la(&osi->osi_obdo, (struct lu_attr *)attr,
 		     attr->la_valid);
 	lustre_set_wire_obdo(NULL, &osi->osi_obdo, &osi->osi_obdo);
-	obdo_cpu_to_le(&osi->osi_obdo, &osi->osi_obdo);
 
 	buf = (char *)&osi->osi_obdo;
 	fid = (struct lu_fid *)lu_object_fid(&dt->do_lu);
@@ -376,7 +369,8 @@ static int osp_md_index_lookup(const struct lu_env *env, struct dt_object *dt,
 	}
 
 	fid = lbuf->lb_buf;
-	fid_le_to_cpu(fid, fid);
+	if (ptlrpc_rep_need_swab(req))
+		lustre_swab_lu_fid(fid);
 	if (!fid_is_sane(fid)) {
 		CERROR("%s: lookup "DFID" %s invalid fid "DFID"\n",
 		       dt_dev->dd_lu_dev.ld_obd->obd_name,
@@ -481,94 +475,102 @@ static int osp_md_index_delete(const struct lu_env *env,
 	return 0;
 }
 
-/**
- * Creates or initializes iterator context.
- *
- * Note: for OSP, these index iterate api is only used to check
- * whether the directory is empty now (see mdd_dir_is_empty).
- * Since dir_empty will be return by OUT_ATTR_GET(see osp_attr_get/
- * out_attr_get). So the implementation of these iterator is simplied
- * to make mdd_dir_is_empty happy. The real iterator should be
- * implemented, if we need it one day.
- */
-static struct dt_it *osp_it_init(const struct lu_env *env,
-				 struct dt_object *dt,
-				 __u32 attr,
-				struct lustre_capa *capa)
-{
-	lu_object_get(&dt->do_lu);
-	return (struct dt_it *)dt;
-}
-
-static void osp_it_fini(const struct lu_env *env, struct dt_it *di)
-{
-	struct dt_object *dt = (struct dt_object *)di;
-	lu_object_put(env, &dt->do_lu);
-}
-
-static int osp_it_get(const struct lu_env *env,
-		      struct dt_it *di, const struct dt_key *key)
-{
-	return 1;
-}
-
-static void osp_it_put(const struct lu_env *env, struct dt_it *di)
+int osp_md_index_it_next(const struct lu_env *env, struct dt_it *di)
 {
-	return;
-}
+	struct osp_it		*it = (struct osp_it *)di;
+	struct lu_idxpage	*idxpage;
+	struct lu_dirent	*ent = (struct lu_dirent *)it->ooi_ent;
+	int			rc;
+	ENTRY;
 
-static int osp_it_next(const struct lu_env *env, struct dt_it *di)
-{
-	struct dt_object *dt = (struct dt_object *)di;
-	struct osp_object *o = dt2osp_obj(dt);
+again:
+	idxpage = it->ooi_cur_idxpage;
+	if (idxpage != NULL) {
+		if (idxpage->lip_nr == 0)
+			RETURN(1);
+
+		it->ooi_pos_ent++;
+		if (ent == NULL) {
+			it->ooi_ent =
+			      (struct lu_dirent *)idxpage->lip_entries;
+			RETURN(0);
+		} else if (le16_to_cpu(ent->lde_reclen) != 0 &&
+			   it->ooi_pos_ent < idxpage->lip_nr) {
+			ent = (struct lu_dirent *)(((char *)ent) +
+					le16_to_cpu(ent->lde_reclen));
+			it->ooi_ent = ent;
+			RETURN(0);
+		} else {
+			it->ooi_ent = NULL;
+		}
+	}
 
-	if (o->opo_empty)
-		return 1;
+	rc = osp_it_next_page(env, di);
+	if (rc == 0)
+		goto again;
 
-	return 0;
+	RETURN(rc);
 }
 
 static struct dt_key *osp_it_key(const struct lu_env *env,
 				 const struct dt_it *di)
 {
-	LBUG();
-	return NULL;
+	struct osp_it		*it = (struct osp_it *)di;
+	struct lu_dirent	*ent = (struct lu_dirent *)it->ooi_ent;
+
+	return (struct dt_key *)ent->lde_name;
 }
 
 static int osp_it_key_size(const struct lu_env *env, const struct dt_it *di)
 {
-	LBUG();
-	return 0;
-}
+	struct osp_it		*it = (struct osp_it *)di;
+	struct lu_dirent	*ent = (struct lu_dirent *)it->ooi_ent;
 
-static int osp_it_rec(const struct lu_env *env, const struct dt_it *di,
-		      struct dt_rec *lde, __u32 attr)
-{
-	LBUG();
-	return 0;
+	return (int)le16_to_cpu(ent->lde_namelen);
 }
 
-static __u64 osp_it_store(const struct lu_env *env, const struct dt_it *di)
+static int osp_md_index_it_rec(const struct lu_env *env, const struct dt_it *di,
+			       struct dt_rec *rec, __u32 attr)
 {
-	LBUG();
+	struct osp_it		*it = (struct osp_it *)di;
+	struct lu_dirent	*ent = (struct lu_dirent *)it->ooi_ent;
+	int			reclen;
+
+	reclen = lu_dirent_calc_size(le16_to_cpu(ent->lde_namelen), attr);
+	memcpy(rec, ent, reclen);
 	return 0;
 }
 
+/**
+ * Locate the iteration cursor to the specified position (cookie).
+ *
+ * \param[in] env	pointer to the thread context
+ * \param[in] di	pointer to the iteration structure
+ * \param[in] hash	the specified position
+ *
+ * \retval		positive number for locating to the exactly position
+ *			or the next
+ * \retval		0 for arriving at the end of the iteration
+ * \retval		negative error number on failure
+ */
 static int osp_it_load(const struct lu_env *env, const struct dt_it *di,
 		       __u64 hash)
 {
-	LBUG();
-	return 0;
-}
+	struct osp_it	*it	= (struct osp_it *)di;
+	int		 rc;
 
-static int osp_it_key_rec(const struct lu_env *env, const struct dt_it *di,
-			  void *key_rec)
-{
-	LBUG();
-	return 0;
+	it->ooi_next = hash;
+	rc = osp_md_index_it_next(env, (struct dt_it *)di);
+	if (rc == 1)
+		return 0;
+
+	if (rc == 0)
+		return 1;
+
+	return rc;
 }
 
-static const struct dt_index_operations osp_md_index_ops = {
+const struct dt_index_operations osp_md_index_ops = {
 	.dio_lookup         = osp_md_index_lookup,
 	.dio_declare_insert = osp_md_declare_insert,
 	.dio_insert         = osp_md_index_insert,
@@ -579,10 +581,10 @@ static const struct dt_index_operations osp_md_index_ops = {
 		.fini     = osp_it_fini,
 		.get      = osp_it_get,
 		.put      = osp_it_put,
-		.next     = osp_it_next,
+		.next     = osp_md_index_it_next,
 		.key      = osp_it_key,
 		.key_size = osp_it_key_size,
-		.rec      = osp_it_rec,
+		.rec      = osp_md_index_it_rec,
 		.store    = osp_it_store,
 		.load     = osp_it_load,
 		.key_rec  = osp_it_key_rec,
@@ -603,8 +605,7 @@ static int osp_md_object_lock(const struct lu_env *env,
 			      struct ldlm_enqueue_info *einfo,
 			      ldlm_policy_data_t *policy)
 {
-	struct osp_thread_info	*info = osp_env_info(env);
-	struct ldlm_res_id	*res_id = &info->osi_resid;
+	struct ldlm_res_id	*res_id;
 	struct dt_device	*dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
 	struct osp_device	*osp = dt2osp_dev(dt_dev);
 	struct ptlrpc_request	*req;
@@ -612,7 +613,8 @@ static int osp_md_object_lock(const struct lu_env *env,
 	__u64			flags = 0;
 	ldlm_mode_t		mode;
 
-	fid_build_reg_res_name(lu_object_fid(&dt->do_lu), res_id);
+	res_id = einfo->ei_res_id;
+	LASSERT(res_id != NULL);
 
 	mode = ldlm_lock_match(osp->opd_obd->obd_namespace,
 			       LDLM_FL_BLOCK_GRANTED, res_id,
@@ -668,6 +670,8 @@ struct dt_object_operations osp_md_obj_ops = {
 	.do_xattr_get         = osp_xattr_get,
 	.do_declare_xattr_set = osp_declare_xattr_set,
 	.do_xattr_set         = osp_xattr_set,
+	.do_declare_xattr_del = osp_declare_xattr_del,
+	.do_xattr_del         = osp_xattr_del,
 	.do_index_try         = osp_md_index_try,
 	.do_object_lock       = osp_md_object_lock,
 	.do_object_unlock     = osp_md_object_unlock,