X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_io.c;h=177f58b9732cd59ae761e2cde00bd280f7c46c6e;hb=f3ea0cea6bb6766eaa55571774b9ae942a6bf297;hp=714645b25dc4d395af49832d15edd7ab5ebbdfed;hpb=9ff2d957982160103b5d885c9a532ad45bdf8d4d;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_io.c b/lustre/ofd/ofd_io.c
index 714645b..177f58b 100644
--- a/lustre/ofd/ofd_io.c
+++ b/lustre/ofd/ofd_io.c
@@ -119,7 +119,7 @@ static void ofd_inconsistency_verify_one(const struct lu_env *env,
 			       ", the old stored PFID "DFID"\n",
 			       ofd_name(ofd), PFID(&fo->ofo_header.loh_fid),
 			       PFID(&oii->oii_pfid), PFID(pfid));
-		} else {
+		} else if (rc < 0) {
 			CDEBUG(D_LFSCK, "%s: fail to fix the OST PFID xattr "
 			       "for "DFID", client given PFID "DFID", local "
 			       "stored PFID "DFID": rc = %d\n",
@@ -464,7 +464,7 @@ static int ofd_preprw_read(const struct lu_env *env, struct obd_export *exp,
 	*nr_local = 0;
 	for (i = 0, j = 0; i < niocount; i++) {
 		rc = dt_bufs_get(env, ofd_object_child(fo), rnb + i,
-				 lnb + j, 0, ofd_object_capa(env, fo));
+				 lnb + j, 0);
 		if (unlikely(rc < 0))
 			GOTO(buf_put, rc);
 		LASSERT(rc <= PTLRPC_MAX_BRW_PAGES);
@@ -476,8 +476,7 @@ static int ofd_preprw_read(const struct lu_env *env, struct obd_export *exp,
 	}
 
 	LASSERT(*nr_local > 0 && *nr_local <= PTLRPC_MAX_BRW_PAGES);
-	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 (unlikely(rc))
 		GOTO(buf_put, rc);
 
@@ -534,8 +533,8 @@ static int ofd_preprw_write(const struct lu_env *env, struct obd_export *exp,
 	LASSERT(objcount == 1);
 
 	if (unlikely(exp->exp_obd->obd_recovering)) {
-		obd_seq seq = fid_seq(fid);
-		obd_id  oid = fid_oid(fid);
+		u64 seq = fid_seq(fid);
+		u64 oid = fid_oid(fid);
 		struct ofd_seq *oseq;
 
 		oseq = ofd_seq_load(env, ofd, seq);
@@ -569,7 +568,7 @@ static int ofd_preprw_write(const struct lu_env *env, struct obd_export *exp,
 			}
 
 			while (diff > 0) {
-				obd_id next_id = ofd_seq_last_oid(oseq) + 1;
+				u64 next_id = ofd_seq_last_oid(oseq) + 1;
 				int count = ofd_precreate_batch(ofd, diff);
 
 				rc = ofd_precreate_objects(env, ofd, next_id,
@@ -620,8 +619,7 @@ static int ofd_preprw_write(const struct lu_env *env, struct obd_export *exp,
 	*nr_local = 0;
 	for (i = 0, j = 0; i < obj->ioo_bufcnt; i++) {
 		rc = dt_bufs_get(env, ofd_object_child(fo),
-				 rnb + i, lnb + j, 1,
-				 ofd_object_capa(env, fo));
+				 rnb + i, lnb + j, 1);
 		if (unlikely(rc < 0))
 			GOTO(err, rc);
 		LASSERT(rc <= PTLRPC_MAX_BRW_PAGES);
@@ -651,6 +649,7 @@ static int ofd_preprw_write(const struct lu_env *env, struct obd_export *exp,
 err:
 	dt_bufs_put(env, ofd_object_child(fo), lnb, *nr_local);
 	ofd_read_unlock(env, fo);
+	ofd_object_put(env, fo);
 	/* ofd_grant_prepare_write() was called, so we must commit */
 	ofd_grant_commit(env, exp, rc);
 out:
@@ -677,7 +676,6 @@ out:
  * \param[in] nr_local	number of local buffers
  * \param[in] lnb	local buffers
  * \param[in] oti	request data from OST
- * \param[in] capa	capability
  *
  * \retval		0 on successful prepare
  * \retval		negative value on error
@@ -685,8 +683,7 @@ out:
 int ofd_preprw(const struct lu_env *env, int cmd, struct obd_export *exp,
 	       struct obdo *oa, int objcount, struct obd_ioobj *obj,
 	       struct niobuf_remote *rnb, int *nr_local,
-	       struct niobuf_local *lnb, struct obd_trans_info *oti,
-	       struct lustre_capa *capa)
+	       struct niobuf_local *lnb, struct obd_trans_info *oti)
 {
 	struct tgt_session_info	*tsi = tgt_ses_info(env);
 	struct ofd_device	*ofd = ofd_exp(exp);
@@ -739,25 +736,15 @@ int ofd_preprw(const struct lu_env *env, int cmd, struct obd_export *exp,
 	LASSERT(obj->ioo_bufcnt > 0);
 
 	if (cmd == OBD_BRW_WRITE) {
-		rc = ofd_auth_capa(exp, fid, ostid_seq(&oa->o_oi),
-				   capa, CAPA_OPC_OSS_WRITE);
-		if (rc == 0) {
-			la_from_obdo(&info->fti_attr, oa, OBD_MD_FLGETATTR);
-			rc = ofd_preprw_write(env, exp, ofd, fid,
-					      &info->fti_attr, oa, objcount,
-					      obj, rnb, nr_local, lnb, jobid);
-		}
+		la_from_obdo(&info->fti_attr, oa, OBD_MD_FLGETATTR);
+		rc = ofd_preprw_write(env, exp, ofd, fid, &info->fti_attr, oa,
+				      objcount, obj, rnb, nr_local, lnb, jobid);
 	} else if (cmd == OBD_BRW_READ) {
-		rc = ofd_auth_capa(exp, fid, ostid_seq(&oa->o_oi),
-				   capa, CAPA_OPC_OSS_READ);
-		if (rc == 0) {
-			ofd_grant_prepare_read(env, exp, oa);
-			rc = ofd_preprw_read(env, exp, ofd, fid,
-					     &info->fti_attr, oa,
-					     obj->ioo_bufcnt, rnb, nr_local,
-					     lnb, jobid);
-			obdo_from_la(oa, &info->fti_attr, LA_ATIME);
-		}
+		ofd_grant_prepare_read(env, exp, oa);
+		rc = ofd_preprw_read(env, exp, ofd, fid, &info->fti_attr, oa,
+				     obj->ioo_bufcnt, rnb, nr_local, lnb,
+				     jobid);
+		obdo_from_la(oa, &info->fti_attr, LA_ATIME);
 	} else {
 		CERROR("%s: wrong cmd %d received!\n",
 		       exp->exp_obd->obd_name, cmd);
@@ -892,8 +879,7 @@ ofd_write_attr_set(const struct lu_env *env, struct ofd_device *ofd,
 
 	/* set uid/gid */
 	if (la->la_valid) {
-		rc = dt_attr_set(env, dt_obj, la, th,
-				 ofd_object_capa(env, ofd_obj));
+		rc = dt_attr_set(env, dt_obj, la, th);
 		if (rc)
 			GOTO(out_tx, rc);
 	}
@@ -904,7 +890,7 @@ ofd_write_attr_set(const struct lu_env *env, struct ofd_device *ofd,
 			GOTO(out_tx, rc);
 
 		rc = dt_xattr_set(env, dt_obj, &info->fti_buf, XATTR_NAME_FID,
-				  0, th, BYPASS_CAPA);
+				  0, th);
 		if (rc == 0) {
 			ofd_obj->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
 			ofd_obj->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);
@@ -1101,13 +1087,13 @@ retry:
 		GOTO(out_stop, rc);
 
 	if (la->la_valid) {
-		rc = dt_attr_set(env, o, la, th, ofd_object_capa(env, fo));
+		rc = dt_attr_set(env, o, la, th);
 		if (rc)
 			GOTO(out_stop, rc);
 	}
 
 	/* get attr to return */
-	rc = dt_attr_get(env, o, la, ofd_object_capa(env, fo));
+	rc = dt_attr_get(env, o, la);
 
 out_stop:
 	/* Force commit to make the just-deleted blocks