X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_lib.c;h=0a7e75af50fa2c02fca1ef1a6faca050957e64e5;hb=2841be335687840cf98961e6c6cde6ee9312e4d7;hp=e3e2f7f8f64f1ebbcf1ec68c27ebcf5acc149da6;hpb=df66537682aef976102a5b986ec2830f8d00b0c6;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qsd_lib.c b/lustre/quota/qsd_lib.c
index e3e2f7f..0a7e75a 100644
--- a/lustre/quota/qsd_lib.c
+++ b/lustre/quota/qsd_lib.c
@@ -367,11 +367,9 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
 	LASSERT(qqi->qqi_acct_obj == NULL);
 	qqi->qqi_acct_obj = acct_obj_lookup(env, qsd->qsd_dev, qtype);
 	if (IS_ERR(qqi->qqi_acct_obj)) {
-		LCONSOLE_WARN("%s: No %s space accounting support. Please "
-			      "consider running tunefs.lustre --quota on an "
-			      "unmounted filesystem to enable quota accounting."
-			      "\n", qsd->qsd_svname,
-			      QTYPE_NAME(qtype));
+		CDEBUG(D_QUOTA, "%s: no %s space accounting support rc:%ld\n",
+		       qsd->qsd_svname, QTYPE_NAME(qtype),
+		       PTR_ERR(qqi->qqi_acct_obj));
 		qqi->qqi_acct_obj = NULL;
 		qsd->qsd_acct_failed = true;
 	}
@@ -489,7 +487,7 @@ void qsd_fini(const struct lu_env *env, struct qsd_instance *qsd)
 
 	/* deregister connection to the quota master */
 	qsd->qsd_exp_valid = false;
-	lustre_deregister_osp_item(&qsd->qsd_exp);
+	lustre_deregister_lwp_item(&qsd->qsd_exp);
 
 	/* release per-filesystem information */
 	if (qsd->qsd_fsinfo != NULL) {
@@ -564,7 +562,9 @@ struct qsd_instance *qsd_init(const struct lu_env *env, char *svname,
 	qsd->qsd_started = false;
 
 	/* copy service name */
-	strncpy(qsd->qsd_svname, svname, MAX_OBD_NAME);
+	if (strlcpy(qsd->qsd_svname, svname, sizeof(qsd->qsd_svname))
+	    >= sizeof(qsd->qsd_svname))
+		GOTO(out, rc = -E2BIG);
 
 	/* grab reference on osd device */
 	lu_device_get(&dev->dd_lu_dev);
@@ -711,7 +711,7 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd)
 	}
 
 	/* generate osp name */
-	rc = tgt_name2ospname((char *)qsd->qsd_svname, qti->qti_buf);
+	rc = tgt_name2lwpname((char *)qsd->qsd_svname, qti->qti_buf);
 	if (rc) {
 		CERROR("%s: failed to generate ospname (%d)\n",
 		       qsd->qsd_svname, rc);
@@ -720,7 +720,7 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd)
 
 	/* the connection callback will start the reintegration
 	 * procedure if quota is enabled */
-	rc = lustre_register_osp_item(qti->qti_buf, &qsd->qsd_exp,
+	rc = lustre_register_lwp_item(qti->qti_buf, &qsd->qsd_exp,
 				      qsd_conn_callback, (void *)qsd);
 	if (rc) {
 		CERROR("%s: fail to get connection to master (%d)\n",