X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqmt_pool.c;h=b20658b8d09977fd8cdaf2f677ec1dedce508865;hb=5963af745b3aa14410d5ceb66f8a7b7d6aaf576a;hp=69b209f28fecd6a8f5cf86e34f26e2164f2f5c33;hpb=5522990660248930108e84c89bc7e5807bda9ea0;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qmt_pool.c b/lustre/quota/qmt_pool.c
index 69b209f..b20658b 100644
--- a/lustre/quota/qmt_pool.c
+++ b/lustre/quota/qmt_pool.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
@@ -176,7 +176,8 @@ static int qpi_soft_least_qunit_seq_show(struct seq_file *m, void *data)
 	struct qmt_pool_info	*pool = m->private;
 	LASSERT(pool != NULL);
 
-	return seq_printf(m, "%lu\n", pool->qpi_soft_least_qunit);
+	seq_printf(m, "%lu\n", pool->qpi_soft_least_qunit);
+	return 0;
 }
 
 static ssize_t
@@ -326,12 +327,12 @@ static void qmt_pool_free(const struct lu_env *env, struct qmt_pool_info *pool)
 		/* release reference to global index */
 		if (pool->qpi_glb_obj[qtype] != NULL &&
 		    !IS_ERR(pool->qpi_glb_obj[qtype]))
-			lu_object_put(env, &pool->qpi_glb_obj[qtype]->do_lu);
+			dt_object_put(env, pool->qpi_glb_obj[qtype]);
 	}
 
 	/* release reference on pool directory */
 	if (pool->qpi_root != NULL && !IS_ERR(pool->qpi_root))
-		lu_object_put(env, &pool->qpi_root->do_lu);
+		dt_object_put(env, pool->qpi_root);
 
 	/* release reference on the master target */
 	if (pool->qpi_qmt != NULL) {
@@ -685,7 +686,7 @@ int qmt_pool_new_conn(const struct lu_env *env, struct qmt_device *qmt,
 	/* retrieve slave fid & current object version */
 	memcpy(slv_fid, lu_object_fid(&slv_obj->do_lu), sizeof(*slv_fid));
 	*slv_ver = dt_version_get(env, slv_obj);
-	lu_object_put(env, &slv_obj->do_lu);
+	dt_object_put(env, slv_obj);
 	if (created)
 		pool->qpi_slv_nr[qtype]++;
 out: