X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_lvb.c;h=8c6dfbe58751a1dfccc70c87ef00c7d329a9ab8a;hb=HEAD;hp=7b463889ae5712cf8b0552c08f56dc4bbfa38cf0;hpb=2339e1b3b69048d65eed1eaa46b307f9116300ee;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_lvb.c b/lustre/ofd/ofd_lvb.c
index 7b46388..f220ded 100644
--- a/lustre/ofd/ofd_lvb.c
+++ b/lustre/ofd/ofd_lvb.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/ofd/ofd_lvb.c
  *
@@ -67,6 +66,20 @@ static int ofd_lvbo_free(struct ldlm_resource *res)
 	return 0;
 }
 
+static bool ofd_resync_allowed(struct ofd_device *ofd)
+{
+	struct obd_device *obd = ofd_obd(ofd);
+
+	if (obd->obd_recovery_start == 0)
+		return false;
+
+	if (obd->obd_recovery_start + obd->obd_recovery_time_hard <
+	    ktime_get_seconds())
+		return false;
+
+	return true;
+}
+
 /**
  * Implementation of ldlm_valblock_ops::lvbo_init for OFD.
  *
@@ -82,13 +95,13 @@ static int ofd_lvbo_free(struct ldlm_resource *res)
  * \retval		0 on successful setup
  * \retval		negative value on error
  */
-static int ofd_lvbo_init(const struct lu_env *env, struct ldlm_resource *res)
+static int ofd_lvbo_init(struct ldlm_resource *res)
 {
 	struct ost_lvb		*lvb;
 	struct ofd_device	*ofd;
 	struct ofd_object	*fo;
 	struct ofd_thread_info	*info;
-	struct lu_env _env;
+	struct lu_env *env;
 	int rc = 0;
 	ENTRY;
 
@@ -101,15 +114,11 @@ static int ofd_lvbo_init(const struct lu_env *env, struct ldlm_resource *res)
 	ofd = ldlm_res_to_ns(res)->ns_lvbp;
 	LASSERT(ofd != NULL);
 
-	if (OBD_FAIL_CHECK(OBD_FAIL_LDLM_OST_LVB))
+	if (CFS_FAIL_CHECK(OBD_FAIL_LDLM_OST_LVB))
 		RETURN(-ENOMEM);
 
-	if (!env) {
-		rc = lu_env_init(&_env, LCT_DT_THREAD);
-		if (rc)
-			RETURN(rc);
-		env = &_env;
-	}
+	env = lu_env_find();
+	LASSERT(env);
 
 	OBD_ALLOC_PTR(lvb);
 	if (lvb == NULL)
@@ -126,8 +135,25 @@ static int ofd_lvbo_init(const struct lu_env *env, struct ldlm_resource *res)
 		GOTO(out_lvb, rc = PTR_ERR(fo));
 
 	rc = ofd_attr_get(env, fo, &info->fti_attr);
-	if (rc)
+	if (rc) {
+		struct ofd_seq		*oseq;
+		__u64			 seq;
+
+		/* Object could be recreated during the first
+		 * CLEANUP_ORPHAN request. */
+		if (rc == -ENOENT) {
+			seq = fid_seq(&info->fti_fid);
+			oseq = ofd_seq_load(env, ofd, fid_seq_is_idif(seq) ?
+					    FID_SEQ_OST_MDT0 : seq);
+			if (!IS_ERR_OR_NULL(oseq)) {
+				if (!oseq->os_last_id_synced &&
+				    ofd_resync_allowed(ofd))
+					rc = -EINPROGRESS;
+				ofd_seq_put(env, oseq);
+			}
+		}
 		GOTO(out_obj, rc);
+	}
 
 	lvb->lvb_size = info->fti_attr.la_size;
 	lvb->lvb_blocks = info->fti_attr.la_blocks;
@@ -135,10 +161,13 @@ static int ofd_lvbo_init(const struct lu_env *env, struct ldlm_resource *res)
 	lvb->lvb_atime = info->fti_attr.la_atime;
 	lvb->lvb_ctime = info->fti_attr.la_ctime;
 
-	CDEBUG(D_DLMTRACE, "res: "DFID" initial lvb size: %llu, "
-	       "mtime: %#llx, blocks: %#llx\n",
-	       PFID(&info->fti_fid), lvb->lvb_size,
-	       lvb->lvb_mtime, lvb->lvb_blocks);
+	if (fo->ofo_atime_ondisk == 0)
+		fo->ofo_atime_ondisk = info->fti_attr.la_atime;
+
+	CDEBUG(D_DLMTRACE,
+	       "res: "DFID" initial LVB size: %llu, mtime: %#llx, atime: %#llx, ctime: %#llx, blocks: %#llx\n",
+	       PFID(&info->fti_fid), lvb->lvb_size, lvb->lvb_mtime,
+	       lvb->lvb_atime, lvb->lvb_ctime, lvb->lvb_blocks);
 
 	info->fti_attr.la_valid = 0;
 
@@ -150,8 +179,6 @@ out_lvb:
 		OST_LVB_SET_ERR(lvb->lvb_blocks, rc);
 out:
 	/* Don't free lvb data on lookup error */
-	if (env && env == &_env)
-		lu_env_fini(&_env);
 	return rc;
 }
 
@@ -184,18 +211,19 @@ out:
  * \retval		0 on successful setup
  * \retval		negative value on error
  */
-static int ofd_lvbo_update(const struct lu_env *env, struct ldlm_resource *res,
-			   struct ldlm_lock *lock, struct ptlrpc_request *req,
-			   int increase_only)
+static int ofd_lvbo_update(struct ldlm_resource *res, struct ldlm_lock *lock,
+			   struct ptlrpc_request *req, int increase_only)
 {
-	struct ofd_thread_info	*info;
-	struct ofd_device	*ofd;
-	struct ofd_object	*fo;
-	struct ost_lvb		*lvb;
-	int			 rc = 0;
+	struct ofd_thread_info *info;
+	struct ofd_device *ofd;
+	struct ofd_object *fo;
+	struct ost_lvb	*lvb;
+	const struct lu_env *env;
+	int rc = 0;
 
 	ENTRY;
 
+	env = lu_env_find();
 	LASSERT(env);
 	info = ofd_info(env);
 	LASSERT(res != NULL);
@@ -323,6 +351,7 @@ disk_update:
 	}
 	unlock_res(res);
 
+	info->fti_attr.la_valid = 0;
 out_obj:
 	ofd_object_put(env, fo);
 out:
@@ -360,8 +389,7 @@ static int ofd_lvbo_size(struct ldlm_lock *lock)
  *
  * \retval		size of LVB data written into \a buf buffer
  */
-static int ofd_lvbo_fill(const struct lu_env *env, struct ldlm_lock *lock,
-			 void *buf, int *buflen)
+static int ofd_lvbo_fill(struct ldlm_lock *lock, void *buf, int *buflen)
 {
 	struct ldlm_resource *res = lock->l_resource;
 	int lvb_len;