X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Flquota_disk.c;h=af2e29905fba84d8310bc39f2add071436bd5af8;hb=5963af745b3aa14410d5ceb66f8a7b7d6aaf576a;hp=a77bfa4ebda6cd9582daf48c6ae7637c4c4dd904;hpb=8fdb46e476f0f54025fd9ff85c274f2ed86315f0;p=fs%2Flustre-release.git

diff --git a/lustre/quota/lquota_disk.c b/lustre/quota/lquota_disk.c
index a77bfa4..af2e299 100644
--- a/lustre/quota/lquota_disk.c
+++ b/lustre/quota/lquota_disk.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
@@ -84,7 +84,7 @@ lquota_disk_find_create(const struct lu_env *env, struct dt_device *dev,
 	/* local_oid_storage_fini() will finalize the local storage device,
 	 * we have to open the object in another device stack */
 	qti->qti_fid = obj->do_lu.lo_header->loh_fid;
-	lu_object_put_nocache(env, &obj->do_lu);
+	dt_object_put_nocache(env, obj);
 	obj = dt_locate(env, dev, &qti->qti_fid);
 	if (IS_ERR(obj))
 		GOTO(out, obj);
@@ -196,7 +196,7 @@ struct dt_object *lquota_disk_dir_find_create(const struct lu_env *env,
 	/* local_oid_storage_fini() will finalize the local storage device,
 	 * we have to open the object in another device stack */
 	qti->qti_fid = qt_dir->do_lu.lo_header->loh_fid;
-	lu_object_put_nocache(env, &qt_dir->do_lu);
+	dt_object_put_nocache(env, qt_dir);
 	qt_dir = dt_locate(env, dev, &qti->qti_fid);
 	if (IS_ERR(qt_dir))
 		GOTO(out, rc = PTR_ERR(qt_dir));
@@ -206,12 +206,12 @@ struct dt_object *lquota_disk_dir_find_create(const struct lu_env *env,
 	EXIT;
 out:
 	if (parent != NULL && !IS_ERR(parent))
-		lu_object_put(env, &parent->do_lu);
+		dt_object_put(env, parent);
 	if (los != NULL)
 		local_oid_storage_fini(env, los);
 	if (rc) {
 		if (qt_dir != NULL && !IS_ERR(qt_dir))
-			lu_object_put(env, &qt_dir->do_lu);
+			dt_object_put(env, qt_dir);
 		qt_dir = ERR_PTR(rc);
 	}
 	return qt_dir;
@@ -282,7 +282,7 @@ struct dt_object *lquota_disk_glb_find_create(const struct lu_env *env,
 			CERROR("%s: failed to setup index operations for "DFID
 			       " rc:%d\n", dev->dd_lu_dev.ld_obd->obd_name,
 			       PFID(lu_object_fid(&glb_idx->do_lu)), rc);
-			lu_object_put(env, &glb_idx->do_lu);
+			dt_object_put(env, glb_idx);
 			glb_idx = ERR_PTR(rc);
 		}
 	}
@@ -342,7 +342,7 @@ struct dt_object *lquota_disk_slv_find(const struct lu_env *env,
 			CERROR("%s: failed to setup slave index operations for "
 			       "%s, rc:%d\n", dev->dd_lu_dev.ld_obd->obd_name,
 			       obd_uuid2str(uuid), rc);
-			lu_object_put(env, &slv_idx->do_lu);
+			dt_object_put(env, slv_idx);
 			slv_idx = ERR_PTR(rc);
 		}
 	}
@@ -437,7 +437,7 @@ struct dt_object *lquota_disk_slv_find_create(const struct lu_env *env,
 			CERROR("%s: failed to setup index operations for "DFID
 			       " rc:%d\n", dev->dd_lu_dev.ld_obd->obd_name,
 			       PFID(lu_object_fid(&slv_idx->do_lu)), rc);
-			lu_object_put(env, &slv_idx->do_lu);
+			dt_object_put(env, slv_idx);
 			slv_idx = ERR_PTR(rc);
 		}
 	}