X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_lvb.c;h=0397f0beeb98d976169fbd8818b31ba3d283e18b;hb=585f819e5e6e240b1c0c0c91e6de923f4f7d1d72;hp=aecd1b6bfc60cde1d8ff2554155d022e15682830;hpb=e02cb40761ff8aae3df76c4210a345420b6d4ba1;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_lvb.c b/lustre/ofd/ofd_lvb.c
index aecd1b6..0397f0b 100644
--- a/lustre/ofd/ofd_lvb.c
+++ b/lustre/ofd/ofd_lvb.c
@@ -82,18 +82,16 @@ 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;
-	int			 rc = 0;
-
+	struct lu_env *env;
+	int rc = 0;
 	ENTRY;
 
-	LASSERT(env);
-	info = ofd_info(env);
 	LASSERT(res);
 	LASSERT(mutex_is_locked(&res->lr_lvb_mutex));
 
@@ -106,10 +104,14 @@ static int ofd_lvbo_init(const struct lu_env *env, struct ldlm_resource *res)
 	if (OBD_FAIL_CHECK(OBD_FAIL_LDLM_OST_LVB))
 		RETURN(-ENOMEM);
 
+	env = lu_env_find();
+	LASSERT(env);
+
 	OBD_ALLOC_PTR(lvb);
 	if (lvb == NULL)
 		GOTO(out, rc = -ENOMEM);
 
+	info = ofd_info(env);
 	res->lr_lvb_data = lvb;
 	res->lr_lvb_len = sizeof(*lvb);
 
@@ -120,8 +122,24 @@ 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)
+					rc = -EAGAIN;
+				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;
@@ -129,10 +147,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;
 
@@ -176,18 +197,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);
@@ -315,6 +337,7 @@ disk_update:
 	}
 	unlock_res(res);
 
+	info->fti_attr.la_valid = 0;
 out_obj:
 	ofd_object_put(env, fo);
 out:
@@ -345,14 +368,14 @@ static int ofd_lvbo_size(struct ldlm_lock *lock)
  *
  * This function is called to fill the given RPC buffer \a buf with LVB data
  *
+ * \param[in] env	execution environment
  * \param[in] lock	LDLM lock
  * \param[in] buf	RPC buffer to fill
  * \param[in] buflen	buffer length
  *
  * \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;
@@ -364,8 +387,8 @@ static int ofd_lvbo_fill(const struct lu_env *env, struct ldlm_lock *lock,
 	lvb_len = ofd_lvbo_size(lock);
 	LASSERT(lvb_len <= res->lr_lvb_len);
 
-	if (lvb_len > buflen)
-		lvb_len = buflen;
+	if (lvb_len > *buflen)
+		lvb_len = *buflen;
 
 	lock_res(res);
 	memcpy(buf, res->lr_lvb_data, lvb_len);