X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_lib.c;h=cc2bd32b9d82f9e815f821a74d9f2db834bc5dc6;hb=3a55e357715492cb195bfeb19ffa34d39f9c6926;hp=1bf6533683a2472d362b393cf37a6d55d1388221;hpb=792be6ca54810b04bdc4fd4f61e4b05fc701e587;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qsd_lib.c b/lustre/quota/qsd_lib.c
index 1bf6533..cc2bd32 100644
--- a/lustre/quota/qsd_lib.c
+++ b/lustre/quota/qsd_lib.c
@@ -85,6 +85,8 @@ static int qsd_state_seq_show(struct seq_file *m, void *data)
 		strcat(enabled, "u");
 	if (qsd_type_enabled(qsd, GRPQUOTA))
 		strcat(enabled, "g");
+	if (qsd_type_enabled(qsd, PRJQUOTA))
+		strncat(enabled, "p", 1);
 	if (strlen(enabled) == 0)
 		strcat(enabled, "none");
 
@@ -103,18 +105,24 @@ static int qsd_state_seq_show(struct seq_file *m, void *data)
 			strcat(enabled, "u");
 		if (qsd->qsd_type_array[GRPQUOTA]->qqi_acct_obj != NULL)
 			strcat(enabled, "g");
+		if (qsd->qsd_type_array[PRJQUOTA]->qqi_acct_obj != NULL)
+			strncat(enabled, "p", 1);
 		if (strlen(enabled) == 0)
 			strcat(enabled, "none");
 		seq_printf(m, "space acct:     %s\n"
 			   "user uptodate:  glb[%d],slv[%d],reint[%d]\n"
-			   "group uptodate: glb[%d],slv[%d],reint[%d]\n",
+			   "group uptodate: glb[%d],slv[%d],reint[%d]\n"
+			   "project uptodate: glb[%d],slv[%d],reint[%d]\n",
 			   enabled,
 			   qsd->qsd_type_array[USRQUOTA]->qqi_glb_uptodate,
 			   qsd->qsd_type_array[USRQUOTA]->qqi_slv_uptodate,
 			   qsd->qsd_type_array[USRQUOTA]->qqi_reint,
 			   qsd->qsd_type_array[GRPQUOTA]->qqi_glb_uptodate,
 			   qsd->qsd_type_array[GRPQUOTA]->qqi_slv_uptodate,
-			   qsd->qsd_type_array[GRPQUOTA]->qqi_reint);
+			   qsd->qsd_type_array[GRPQUOTA]->qqi_reint,
+			   qsd->qsd_type_array[PRJQUOTA]->qqi_glb_uptodate,
+			   qsd->qsd_type_array[PRJQUOTA]->qqi_slv_uptodate,
+			   qsd->qsd_type_array[PRJQUOTA]->qqi_reint);
 	}
 	return 0;
 }
@@ -132,6 +140,8 @@ static int qsd_enabled_seq_show(struct seq_file *m, void *data)
 		strcat(enabled, "u");
 	if (qsd_type_enabled(qsd, GRPQUOTA))
 		strcat(enabled, "g");
+	if (qsd_type_enabled(qsd, PRJQUOTA))
+		strncat(enabled, "p", 1);
 	if (strlen(enabled) == 0)
 		strcat(enabled, "none");
 
@@ -426,7 +436,7 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
 		       qsd->qsd_svname, qtype_name(qtype),
 		       PTR_ERR(qqi->qqi_acct_obj));
 		qqi->qqi_acct_obj = NULL;
-		qsd->qsd_acct_failed = true;
+		qqi->qqi_acct_failed = true;
 	}
 
 	/* open global index copy */
@@ -740,7 +750,8 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd)
 	for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
 		struct qsd_qtype_info	*qqi = qsd->qsd_type_array[qtype];
 
-		if (qsd_type_enabled(qsd, qtype) && qsd->qsd_acct_failed) {
+		if (qsd_type_enabled(qsd, qtype) &&
+		    qqi->qqi_acct_failed) {
 			LCONSOLE_ERROR("%s: can't enable quota enforcement "
 				       "since space accounting isn't functional"
 				       ". Please run tunefs.lustre --quota on "