X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_objects.c;h=22c6580d3a43fe656fecabc1df236f094416f74a;hb=2a1436206212072fdb54fa72bc4df9c227c94754;hp=8191c00f2ca9158c3ac3f79229a9d0907429e5ec;hpb=9fb46705ae86aa2c0ac29427f0ff24f923560eb7;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_objects.c b/lustre/ofd/ofd_objects.c
index 8191c00f..22c6580 100644
--- a/lustre/ofd/ofd_objects.c
+++ b/lustre/ofd/ofd_objects.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,6 +42,7 @@
 #define DEBUG_SUBSYSTEM S_FILTER
 
 #include <dt_object.h>
+#include <lustre/lustre_idl.h>
 
 #include "ofd_internal.h"
 
@@ -83,7 +84,8 @@ struct ofd_object *ofd_object_find(const struct lu_env *env,
 	if (likely(!IS_ERR(o)))
 		fo = ofd_obj(o);
 	else
-		fo = (struct ofd_object *)o; /* return error */
+		fo = ERR_CAST(o); /* return error */
+
 	RETURN(fo);
 }
 
@@ -102,7 +104,7 @@ struct ofd_object *ofd_object_find_or_create(const struct lu_env *env,
 
 	dto = dt_find_or_create(env, ofd->ofd_osd, fid, &info->fti_dof, attr);
 	if (IS_ERR(dto))
-		RETURN((struct ofd_object *)dto);
+		RETURN(ERR_CAST(dto));
 
 	fo_obj = lu_object_locate(dto->do_lu.lo_header,
 				  ofd->ofd_dt_dev.dd_lu_dev.ld_type);
@@ -111,8 +113,7 @@ struct ofd_object *ofd_object_find_or_create(const struct lu_env *env,
 
 int ofd_object_ff_check(const struct lu_env *env, struct ofd_object *fo)
 {
-	struct ofd_thread_info	*info = ofd_info(env);
-	int			 rc = 0;
+	int rc = 0;
 
 	ENTRY;
 
@@ -121,9 +122,7 @@ int ofd_object_ff_check(const struct lu_env *env, struct ofd_object *fo)
 		 * This actually means that we don't know whether the object
 		 * has the "fid" EA or not.
 		 */
-		info->fti_buf.lb_buf = &info->fti_mds_fid2;
-		info->fti_buf.lb_len = sizeof(info->fti_mds_fid2);
-		rc = dt_xattr_get(env, ofd_object_child(fo), &info->fti_buf,
+		rc = dt_xattr_get(env, ofd_object_child(fo), &LU_BUF_NULL,
 				  XATTR_NAME_FID, BYPASS_CAPA);
 		if (rc >= 0 || rc == -ENODATA) {
 			/*
@@ -146,7 +145,7 @@ void ofd_object_put(const struct lu_env *env, struct ofd_object *fo)
 }
 
 int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
-			  obd_id id, obd_seq seq, int nr)
+			  obd_id id, struct ofd_seq *oseq, int nr, int sync)
 {
 	struct ofd_thread_info	*info = ofd_info(env);
 	struct ofd_object	*fo = NULL;
@@ -162,14 +161,15 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
 	ENTRY;
 
 	/* Don't create objects beyond the valid range for this SEQ */
-	if (unlikely(fid_seq_is_mdt0(seq) && (id + nr) >= IDIF_MAX_OID)) {
-		CERROR("%s:"POSTID" hit the IDIF_MAX_OID (1<<48)!\n",
-		       ofd_name(ofd), id, seq);
+	if (unlikely(fid_seq_is_mdt0(ostid_seq(&oseq->os_oi)) &&
+		     (id + nr) >= IDIF_MAX_OID)) {
+		CERROR("%s:"DOSTID" hit the IDIF_MAX_OID (1<<48)!\n",
+		       ofd_name(ofd), id, ostid_seq(&oseq->os_oi));
 		RETURN(rc = -ENOSPC);
-	} else if (unlikely(!fid_seq_is_mdt0(seq) &&
-		   (id + nr) >= OBIF_MAX_OID)) {
-		CERROR("%s:"POSTID" hit the OBIF_MAX_OID (1<<32)!\n",
-		       ofd_name(ofd), id, seq);
+	} else if (unlikely(!fid_seq_is_mdt0(ostid_seq(&oseq->os_oi)) &&
+			    (id + nr) >= OBIF_MAX_OID)) {
+		CERROR("%s:"DOSTID" hit the OBIF_MAX_OID (1<<32)!\n",
+		       ofd_name(ofd), id, ostid_seq(&oseq->os_oi));
 		RETURN(rc = -ENOSPC);
 	}
 
@@ -195,14 +195,13 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
 	info->fti_attr.la_ctime = 0;
 
 	/* prepare objects */
+	ostid_set_seq(&info->fti_ostid, ostid_seq(&oseq->os_oi));
 	for (i = 0; i < nr; i++) {
-		info->fti_ostid.oi_id = id + i;
-		info->fti_ostid.oi_seq = seq;
-
-		rc = fid_ostid_unpack(&info->fti_fid, &info->fti_ostid, 0);
+		ostid_set_id(&info->fti_ostid, id + i);
+		rc = ostid_to_fid(&info->fti_fid, &info->fti_ostid, 0);
 		if (rc) {
 			if (i == 0)
-				GOTO(out, rc = PTR_ERR(fo));
+				GOTO(out, rc);
 
 			nr = i;
 			break;
@@ -228,8 +227,10 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
 	if (IS_ERR(th))
 		GOTO(out, rc = PTR_ERR(th));
 
-	rc = dt_declare_record_write(env, ofd->ofd_lastid_obj[seq],
-				     sizeof(tmp), info->fti_off, th);
+	th->th_sync |= sync;
+
+	rc = dt_declare_record_write(env, oseq->os_lastid_obj, sizeof(tmp),
+				     info->fti_off, th);
 	if (rc)
 		GOTO(trans_stop, rc);
 
@@ -239,8 +240,9 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
 
 		if (unlikely(ofd_object_exists(fo))) {
 			/* object may exist being re-created by write replay */
-			CDEBUG(D_INODE, "object "LPD64"/"LPD64" exists: "
-			       DFID"\n", seq, id, PFID(&info->fti_fid));
+			CDEBUG(D_INODE, "object "LPX64"/"LPX64" exists: "
+			       DFID"\n", ostid_seq(&oseq->os_oi), id,
+			       PFID(&info->fti_fid));
 			continue;
 		}
 
@@ -259,7 +261,8 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
 	if (rc)
 		GOTO(trans_stop, rc);
 
-	CDEBUG(D_OTHER, "create new object "DFID"\n", PFID(&info->fti_fid));
+	CDEBUG(D_OTHER, "%s: create new object "DFID" nr %d\n",
+	       ofd_name(ofd), PFID(&info->fti_fid), nr);
 
 	for (i = 0; i < nr; i++) {
 		fo = batch[i];
@@ -275,13 +278,13 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
 				break;
 			LASSERT(ofd_object_exists(fo));
 		}
-		ofd_last_id_set(ofd, id + i, seq);
+		ofd_seq_last_oid_set(oseq, id + i);
 	}
 
 	objects = i;
 	if (objects > 0) {
-		tmp = cpu_to_le64(ofd_last_id(ofd, seq));
-		rc = dt_record_write(env, ofd->ofd_lastid_obj[seq],
+		tmp = cpu_to_le64(ofd_seq_last_oid(oseq));
+		rc = dt_record_write(env, oseq->os_lastid_obj,
 				     &info->fti_buf, &info->fti_off, th);
 	}
 trans_stop: