X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Flocal_storage.c;h=04c25ebd88274ae6787c610c95e65328e0fd0398;hb=3ec13d260bf6b18dd741d38f16eaf5cf567b8aef;hp=ffcf1042973157b9564cbedc3de031942053ac02;hpb=500f334631c6ebec72f5791472f21603da3e0ef9;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/local_storage.c b/lustre/obdclass/local_storage.c
index ffcf104..04c25eb 100644
--- a/lustre/obdclass/local_storage.c
+++ b/lustre/obdclass/local_storage.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * lustre/obdclass/local_storage.c
@@ -35,7 +35,7 @@
 #include "local_storage.h"
 
 /* all initialized local storages on this node are linked on this */
-static struct list_head ls_list_head = LIST_HEAD_INIT(ls_list_head);
+static LIST_HEAD(ls_list_head);
 static DEFINE_MUTEX(ls_list_mutex);
 
 static int ls_object_init(const struct lu_env *env, struct lu_object *o,
@@ -388,14 +388,14 @@ static struct dt_object *__local_file_create(const struct lu_env *env,
 		rec->rec_fid = fid;
 		/* Add "." and ".." for newly created dir */
 		rc = dt_insert(env, dto, (const struct dt_rec *)rec,
-			       (const struct dt_key *)".", th, 1);
+			       (const struct dt_key *)".", th);
 		if (rc != 0)
 			GOTO(destroy, rc);
 
 		dt_ref_add(env, dto, th);
 		rec->rec_fid = lu_object_fid(&parent->do_lu);
 		rc = dt_insert(env, dto, (const struct dt_rec *)rec,
-			       (const struct dt_key *)"..", th, 1);
+			       (const struct dt_key *)"..", th);
 		if (rc != 0)
 			GOTO(destroy, rc);
 	}
@@ -404,7 +404,7 @@ static struct dt_object *__local_file_create(const struct lu_env *env,
 	rec->rec_type = dto->do_lu.lo_header->loh_attr;
 	dt_write_lock(env, parent, LOS_PARENT);
 	rc = dt_insert(env, parent, (const struct dt_rec *)rec,
-		       (const struct dt_key *)name, th, 1);
+		       (const struct dt_key *)name, th);
 	if (dti->dti_dof.dof_type == DFT_DIR)
 		dt_ref_add(env, parent, th);
 	dt_write_unlock(env, parent);
@@ -419,12 +419,34 @@ trans_stop:
 	dt_trans_stop(env, ls->ls_osd, th);
 out:
 	if (rc) {
-		lu_object_put_nocache(env, &dto->do_lu);
+		dt_object_put_nocache(env, dto);
 		dto = ERR_PTR(rc);
 	}
 	RETURN(dto);
 }
 
+struct dt_object *local_file_find(const struct lu_env *env,
+				  struct local_oid_storage *los,
+				  struct dt_object *parent,
+				  const char *name)
+{
+	struct dt_thread_info	*dti = dt_info(env);
+	struct dt_object	*dto;
+	int			 rc;
+
+	LASSERT(parent);
+
+	rc = dt_lookup_dir(env, parent, name, &dti->dti_fid);
+	if (!rc)
+		dto = ls_locate(env, dt2ls_dev(los->los_dev),
+				&dti->dti_fid, NULL);
+	else
+		dto = ERR_PTR(rc);
+
+	return dto;
+}
+EXPORT_SYMBOL(local_file_find);
+
 /*
  * Look up and create (if it does not exist) a local named file or directory in
  * parent directory.
@@ -438,30 +460,21 @@ struct dt_object *local_file_find_or_create(const struct lu_env *env,
 	struct dt_object	*dto;
 	int			 rc;
 
-	LASSERT(parent);
+	dto = local_file_find(env, los, parent, name);
+	if (!IS_ERR(dto) || PTR_ERR(dto) != -ENOENT)
+		return dto;
 
-	rc = dt_lookup_dir(env, parent, name, &dti->dti_fid);
-	if (rc == 0)
-		/* name is found, get the object */
-		dto = ls_locate(env, dt2ls_dev(los->los_dev),
-				&dti->dti_fid, NULL);
-	else if (rc != -ENOENT)
-		dto = ERR_PTR(rc);
-	else {
-		rc = local_object_fid_generate(env, los, &dti->dti_fid);
-		if (rc < 0) {
-			dto = ERR_PTR(rc);
-		} else {
-			/* create the object */
-			dti->dti_attr.la_valid	= LA_MODE;
-			dti->dti_attr.la_mode	= mode;
-			dti->dti_dof.dof_type	= dt_mode_to_dft(mode & S_IFMT);
-			dto = __local_file_create(env, &dti->dti_fid, los,
-						  dt2ls_dev(los->los_dev),
-						  parent, name, &dti->dti_attr,
-						  &dti->dti_dof);
-		}
-	}
+	rc = local_object_fid_generate(env, los, &dti->dti_fid);
+	if (rc)
+		return ERR_PTR(rc);
+
+	/* create the object */
+	dti->dti_attr.la_valid = LA_MODE;
+	dti->dti_attr.la_mode = mode;
+	dti->dti_dof.dof_type = dt_mode_to_dft(mode & S_IFMT);
+	dto = __local_file_create(env, &dti->dti_fid, los,
+				  dt2ls_dev(los->los_dev), parent, name,
+				  &dti->dti_attr, &dti->dti_dof);
 	return dto;
 }
 EXPORT_SYMBOL(local_file_find_or_create);
@@ -502,7 +515,7 @@ struct dt_object *local_file_find_or_create_with_fid(const struct lu_env *env,
 			 * have to open the object in other device stack */
 			if (!IS_ERR(dto)) {
 				dti->dti_fid = dto->do_lu.lo_header->loh_fid;
-				lu_object_put_nocache(env, &dto->do_lu);
+				dt_object_put_nocache(env, dto);
 				dto = dt_locate(env, dt, &dti->dti_fid);
 			}
 			ls_device_put(env, ls);
@@ -598,7 +611,7 @@ local_index_find_or_create_with_fid(const struct lu_env *env,
 			 * have to open the object in other device stack */
 			if (!IS_ERR(dto)) {
 				dti->dti_fid = dto->do_lu.lo_header->loh_fid;
-				lu_object_put_nocache(env, &dto->do_lu);
+				dt_object_put_nocache(env, dto);
 				dto = dt_locate(env, dt, &dti->dti_fid);
 			}
 			ls_device_put(env, ls);
@@ -671,7 +684,7 @@ int local_object_unlink(const struct lu_env *env, struct dt_device *dt,
 		rec->rec_fid = &dti->dti_fid;
 		rec->rec_type = dto->do_lu.lo_header->loh_attr;
 		rc = dt_insert(env, parent, (const struct dt_rec *)rec,
-			       (const struct dt_key *)name, th, 1);
+			       (const struct dt_key *)name, th);
 		GOTO(unlock, rc);
 	}
 
@@ -681,7 +694,7 @@ unlock:
 stop:
 	dt_trans_stop(env, dt, th);
 out:
-	lu_object_put_nocache(env, &dto->do_lu);
+	dt_object_put_nocache(env, dto);
 	return rc;
 }
 EXPORT_SYMBOL(local_object_unlink);
@@ -734,7 +747,7 @@ static int lastid_compat_check(const struct lu_env *env, struct dt_device *dev,
 	snprintf(dti->dti_buf, sizeof(dti->dti_buf), "seq-%#llx-lastid",
 		 lastid_seq);
 	rc = dt_lookup_dir(env, root, dti->dti_buf, &dti->dti_fid);
-	lu_object_put_nocache(env, &root->do_lu);
+	dt_object_put_nocache(env, root);
 	if (rc == -ENOENT) {
 		/* old llog lastid accessed by FID only */
 		if (lastid_seq != FID_SEQ_LLOG)
@@ -747,7 +760,7 @@ static int lastid_compat_check(const struct lu_env *env, struct dt_device *dev,
 			return PTR_ERR(o);
 
 		if (!dt_object_exists(o)) {
-			lu_object_put_nocache(env, &o->do_lu);
+			dt_object_put_nocache(env, o);
 			return 0;
 		}
 		CDEBUG(D_INFO, "Found old llog lastid file\n");
@@ -777,7 +790,7 @@ static int lastid_compat_check(const struct lu_env *env, struct dt_device *dev,
 		CERROR("%s: failed to read seq-%#llx-lastid: rc = %d\n",
 		       o->do_lu.lo_dev->ld_obd->obd_name, lastid_seq, rc);
 	}
-	lu_object_put_nocache(env, &o->do_lu);
+	dt_object_put_nocache(env, o);
 	if (rc == 0)
 		*first_oid = le32_to_cpu(losd.lso_next_oid);
 	return rc;
@@ -914,7 +927,7 @@ out_los:
 		OBD_FREE_PTR(*los);
 		*los = NULL;
 		if (o != NULL && !IS_ERR(o))
-			lu_object_put_nocache(env, &o->do_lu);
+			dt_object_put_nocache(env, o);
 	} else {
 		(*los)->los_seq = fid_seq(first_fid);
 		(*los)->los_last_oid = le64_to_cpu(lastid);
@@ -951,7 +964,7 @@ void local_oid_storage_fini(const struct lu_env *env,
 	}
 
 	if (los->los_obj)
-		lu_object_put_nocache(env, &los->los_obj->do_lu);
+		dt_object_put_nocache(env, los->los_obj);
 	list_del(&los->los_list);
 	OBD_FREE_PTR(los);
 	mutex_unlock(&ls->ls_los_mutex);