X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_io.c;h=0608cd99e4445f5e33e1c0a506930501a9ada229;hb=b4d4a448b2ed93a8bc73db81bbf9c8ba08250e3a;hp=269a7236ebe1228d71f6279d17d836e1c845fc7a;hpb=f6d744d259fe6bc0b8750127565fb13fb2e66c06;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_io.c b/lustre/ofd/ofd_io.c
index 269a723..0608cd9 100644
--- a/lustre/ofd/ofd_io.c
+++ b/lustre/ofd/ofd_io.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014 Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,6 +40,7 @@
 
 #define DEBUG_SUBSYSTEM S_FILTER
 
+#include <linux/kthread.h>
 #include "ofd_internal.h"
 
 struct ofd_inconsistency_item {
@@ -171,7 +172,7 @@ static int ofd_inconsistency_verification_main(void *args)
 
 	OBD_ALLOC_PTR(lr);
 	if (unlikely(lr == NULL))
-		GOTO(out, rc = -ENOMEM);
+		GOTO(out_unlocked, rc = -ENOMEM);
 
 	lr->lr_event = LE_PAIRS_VERIFY;
 	lr->lr_active = LFSCK_TYPE_LAYOUT;
@@ -222,6 +223,8 @@ static int ofd_inconsistency_verification_main(void *args)
 
 	GOTO(out, rc = 0);
 
+out_unlocked:
+	spin_lock(&ofd->ofd_inconsistency_lock);
 out:
 	thread_set_flags(thread, SVC_STOPPED);
 	wake_up_all(&thread->t_ctl_waitq);
@@ -464,7 +467,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 +479,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);
 
@@ -620,8 +622,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,8 +652,9 @@ 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);
+	ofd_grant_commit(exp, oa->o_grant_used, rc);
 out:
 	/* let's still process incoming grant information packed in the oa,
 	 * but without enforcing grant since we won't proceed with the write.
@@ -676,8 +678,6 @@ out:
  * \param[in] rnb	remote buffers
  * \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 +685,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 tgt_session_info	*tsi = tgt_ses_info(env);
 	struct ofd_device	*ofd = ofd_exp(exp);
@@ -703,9 +702,7 @@ int ofd_preprw(const struct lu_env *env, int cmd, struct obd_export *exp,
 	}
 
 	if (tgt_ses_req(tsi) == NULL) { /* echo client case */
-		LASSERT(oti != NULL);
 		info = ofd_info_init(env, exp);
-		ofd_oti2info(info, oti);
 		jobid = NULL;
 	} else {
 		info = tsi2ofd_info(tsi);
@@ -714,7 +711,7 @@ int ofd_preprw(const struct lu_env *env, int cmd, struct obd_export *exp,
 
 	LASSERT(oa != NULL);
 
-	if (OBD_FAIL_CHECK(OBD_FAIL_OST_ENOENT)) {
+	if (OBD_FAIL_CHECK(OBD_FAIL_SRV_ENOENT)) {
 		struct ofd_seq		*oseq;
 
 		oseq = ofd_seq_load(env, ofd, ostid_seq(&oa->o_oi));
@@ -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);
@@ -1013,6 +999,7 @@ static int ofd_soft_sync_cb_add(struct thandle *th, struct obd_export *exp)
  * \param[in] objcount	always 1
  * \param[in] niocount	number of local buffers
  * \param[in] lnb	local buffers
+ * \param[in] granted	grant space consumed for the bulk I/O
  * \param[in] old_rc	result of processing at this point
  *
  * \retval		0 on successful commit
@@ -1022,9 +1009,9 @@ static int
 ofd_commitrw_write(const struct lu_env *env, struct obd_export *exp,
 		   struct ofd_device *ofd, const struct lu_fid *fid,
 		   struct lu_attr *la, struct filter_fid *ff, int objcount,
-		   int niocount, struct niobuf_local *lnb, int old_rc)
+		   int niocount, struct niobuf_local *lnb,
+		   unsigned long granted, int old_rc)
 {
-	struct ofd_thread_info	*info = ofd_info(env);
 	struct ofd_object	*fo;
 	struct dt_object	*o;
 	struct thandle		*th;
@@ -1101,13 +1088,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
@@ -1121,6 +1108,11 @@ out_stop:
 		cb_registered = true;
 	}
 
+	if (rc == 0 && granted > 0) {
+		if (ofd_grant_commit_cb_add(th, exp, granted) == 0)
+			granted = 0;
+	}
+
 	ofd_trans_stop(env, ofd, th, rc);
 	if (rc == -ENOSPC && retries++ < 3) {
 		CDEBUG(D_INODE, "retry after force commit, retries:%d\n",
@@ -1141,7 +1133,8 @@ out:
 	ofd_object_put(env, fo);
 	/* second put is pair to object_get in ofd_preprw_write */
 	ofd_object_put(env, fo);
-	ofd_grant_commit(env, info->fti_exp, old_rc);
+	if (granted > 0)
+		ofd_grant_commit(exp, granted, old_rc);
 	RETURN(rc);
 }
 
@@ -1162,7 +1155,6 @@ out:
  * \param[in] rnb	remote buffers
  * \param[in] npages	number of local buffers
  * \param[in] lnb	local buffers
- * \param[in] oti	request data from OST
  * \param[in] old_rc	result of processing at this point
  *
  * \retval		0 on successful commit
@@ -1171,8 +1163,7 @@ out:
 int ofd_commitrw(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 npages,
-		 struct niobuf_local *lnb, struct obd_trans_info *oti,
-		 int old_rc)
+		 struct niobuf_local *lnb, int old_rc)
 {
 	struct ofd_thread_info	*info = ofd_info(env);
 	struct ofd_mod_data	*fmd;
@@ -1206,7 +1197,8 @@ int ofd_commitrw(const struct lu_env *env, int cmd, struct obd_export *exp,
 		}
 
 		rc = ofd_commitrw_write(env, exp, ofd, fid, &info->fti_attr,
-					ff, objcount, npages, lnb, old_rc);
+					ff, objcount, npages, lnb,
+					oa->o_grant_used, old_rc);
 		if (rc == 0)
 			obdo_from_la(oa, &info->fti_attr,
 				     OFD_VALID_FLAGS | LA_GID | LA_UID);
@@ -1260,7 +1252,5 @@ int ofd_commitrw(const struct lu_env *env, int cmd, struct obd_export *exp,
 		rc = -EPROTO;
 	}
 
-	if (oti != NULL)
-		ofd_info2oti(info, oti);
 	RETURN(rc);
 }