X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_objects.c;h=888186c7ec7c94f2b2d079e77e0c3bf64d849638;hb=26b8238659974959780cd49de92595b4b0bdf89f;hp=1b3b4f09b3b06c73ea55d5303bd32771df33a225;hpb=9ff2d957982160103b5d885c9a532ad45bdf8d4d;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_objects.c b/lustre/ofd/ofd_objects.c
index 1b3b4f0..888186c 100644
--- a/lustre/ofd/ofd_objects.c
+++ b/lustre/ofd/ofd_objects.c
@@ -60,8 +60,8 @@
  * \retval		0 if version matches
  * \retval		-EOVERFLOW on version mismatch
  */
-int ofd_version_get_check(struct ofd_thread_info *info,
-			  struct ofd_object *fo)
+static int ofd_version_get_check(struct ofd_thread_info *info,
+				 struct ofd_object *fo)
 {
 	dt_obj_version_t curr_version;
 
@@ -148,8 +148,7 @@ int ofd_object_ff_load(const struct lu_env *env, struct ofd_object *fo)
 
 	buf->lb_buf = ff;
 	buf->lb_len = sizeof(*ff);
-	rc = dt_xattr_get(env, ofd_object_child(fo), buf, XATTR_NAME_FID,
-			  BYPASS_CAPA);
+	rc = dt_xattr_get(env, ofd_object_child(fo), buf, XATTR_NAME_FID);
 	if (rc < 0)
 		return rc;
 
@@ -205,7 +204,7 @@ void ofd_object_put(const struct lu_env *env, struct ofd_object *fo)
  * \retval		negative value on error
  */
 int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
-			  obd_id id, struct ofd_seq *oseq, int nr, int sync)
+			  u64 id, struct ofd_seq *oseq, int nr, int sync)
 {
 	struct ofd_thread_info	*info = ofd_info(env);
 	struct ofd_object	*fo = NULL;
@@ -213,7 +212,7 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
 	struct thandle		*th;
 	struct ofd_object	**batch;
 	struct lu_fid		*fid = &info->fti_fid;
-	obd_id			 tmp;
+	u64			 tmp;
 	int			 rc;
 	int			 i;
 	int			 objects = 0;
@@ -445,7 +444,7 @@ int ofd_attr_handle_ugid(const struct lu_env *env, struct ofd_object *fo,
 	if (!(la->la_valid & LA_UID) && !(la->la_valid & LA_GID))
 		RETURN(0);
 
-	rc = dt_attr_get(env, ofd_object_child(fo), ln, BYPASS_CAPA);
+	rc = dt_attr_get(env, ofd_object_child(fo), ln);
 	if (rc != 0)
 		RETURN(rc);
 
@@ -550,14 +549,13 @@ int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo,
 	if (rc)
 		GOTO(stop, rc);
 
-	rc = dt_attr_set(env, ofd_object_child(fo), la, th,
-			 ofd_object_capa(env, fo));
+	rc = dt_attr_set(env, ofd_object_child(fo), la, th);
 	if (rc)
 		GOTO(stop, rc);
 
 	if (ff_needed) {
 		rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
-				  XATTR_NAME_FID, 0, th, BYPASS_CAPA);
+				  XATTR_NAME_FID, 0, th);
 		if (rc == 0) {
 			fo->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
 			fo->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);
@@ -616,12 +614,12 @@ int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo,
 	/* we support truncate, not punch yet */
 	LASSERT(end == OBD_OBJECT_EOF);
 
+	ofd_write_lock(env, fo);
 	fmd = ofd_fmd_get(info->fti_exp, &fo->ofo_header.loh_fid);
 	if (fmd && fmd->fmd_mactime_xid < info->fti_xid)
 		fmd->fmd_mactime_xid = info->fti_xid;
 	ofd_fmd_put(info->fti_exp, fmd);
 
-	ofd_write_lock(env, fo);
 	if (!ofd_object_exists(fo))
 		GOTO(unlock, rc = -ENOENT);
 
@@ -674,18 +672,17 @@ int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo,
 	if (rc)
 		GOTO(stop, rc);
 
-	rc = dt_punch(env, dob, start, OBD_OBJECT_EOF, th,
-		      ofd_object_capa(env, fo));
+	rc = dt_punch(env, dob, start, OBD_OBJECT_EOF, th);
 	if (rc)
 		GOTO(stop, rc);
 
-	rc = dt_attr_set(env, dob, la, th, ofd_object_capa(env, fo));
+	rc = dt_attr_set(env, dob, la, th);
 	if (rc)
 		GOTO(stop, rc);
 
 	if (ff_needed) {
 		rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
-				  XATTR_NAME_FID, 0, th, BYPASS_CAPA);
+				  XATTR_NAME_FID, 0, th);
 		if (rc == 0) {
 			fo->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
 			fo->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);
@@ -739,8 +736,14 @@ int ofd_object_destroy(const struct lu_env *env, struct ofd_object *fo,
 	if (IS_ERR(th))
 		GOTO(unlock, rc = PTR_ERR(th));
 
-	dt_declare_ref_del(env, ofd_object_child(fo), th);
-	dt_declare_destroy(env, ofd_object_child(fo), th);
+	rc = dt_declare_ref_del(env, ofd_object_child(fo), th);
+	if (rc < 0)
+		GOTO(stop, rc);
+
+	rc = dt_declare_destroy(env, ofd_object_child(fo), th);
+	if (rc < 0)
+		GOTO(stop, rc);
+
 	if (orphan)
 		rc = dt_trans_start_local(env, ofd->ofd_osd, th);
 	else
@@ -780,8 +783,7 @@ int ofd_attr_get(const struct lu_env *env, struct ofd_object *fo,
 	ENTRY;
 
 	if (ofd_object_exists(fo)) {
-		rc = dt_attr_get(env, ofd_object_child(fo), la,
-				 ofd_object_capa(env, fo));
+		rc = dt_attr_get(env, ofd_object_child(fo), la);
 
 #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
 		/* Try to correct for a bug in 2.1.0 (LU-221) that caused