LU-1714 lnet: Properly initialize sg_magic value

[fs/lustre-release.git] / lustre / quota / qsd_lib.c

diff --git a/lustre/quota/qsd_lib.c b/lustre/quota/qsd_lib.c
index 5a8c7b0..64c537e 100644 (file)
--- a/lustre/quota/qsd_lib.c
+++ b/lustre/quota/qsd_lib.c
@@ -174,10 +174,37 @@ static int lprocfs_qsd_wr_force_reint(struct file *file, const char *buffer,
        return rc == 0 ? count : rc;
 }
 
+static int lprocfs_qsd_rd_timeout(char *page, char **start, off_t off,
+                                 int count, int *eof, void *data)
+{
+       struct qsd_instance     *qsd = (struct qsd_instance *)data;
+       LASSERT(qsd != NULL);
+
+       return snprintf(page, count, "%d\n", qsd_wait_timeout(qsd));
+}
+
+static int lprocfs_qsd_wr_timeout(struct file *file, const char *buffer,
+                                 unsigned long count, void *data)
+{
+       struct qsd_instance     *qsd = (struct qsd_instance *)data;
+       int                      timeout, rc;
+       LASSERT(qsd != NULL);
+
+       rc = lprocfs_write_helper(buffer, count, &timeout);
+       if (rc)
+               return rc;
+       if (timeout < 0)
+               return -EINVAL;
+
+       qsd->qsd_timeout = timeout;
+       return count;
+}
+
 static struct lprocfs_vars lprocfs_quota_qsd_vars[] = {
        { "info", lprocfs_qsd_rd_state, 0, 0},
        { "enabled", lprocfs_qsd_rd_enabled, 0, 0},
        { "force_reint", 0, lprocfs_qsd_wr_force_reint, 0},
+       { "timeout", lprocfs_qsd_rd_timeout, lprocfs_qsd_wr_timeout, 0},
        { NULL }
 };
 
@@ -374,7 +401,7 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
                GOTO(out, rc = PTR_ERR(qqi->qqi_site));
        }
 
-       /* register proc entry for accounting object */
+       /* register proc entry for accounting & global index copy objects */
        rc = lprocfs_seq_create(qsd->qsd_proc,
                                qtype == USRQUOTA ? "acct_user" : "acct_group",
                                0444, &lprocfs_quota_seq_fops,
@@ -384,6 +411,16 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
                       qsd->qsd_svname, rc);
                GOTO(out, rc);
        }
+
+       rc = lprocfs_seq_create(qsd->qsd_proc,
+                               qtype == USRQUOTA ? "limit_user" : "limit_group",
+                               0444, &lprocfs_quota_seq_fops,
+                               qqi->qqi_glb_obj);
+       if (rc) {
+               CERROR("%s: can't add procfs entry for global index copy %d\n",
+                      qsd->qsd_svname, rc);
+               GOTO(out, rc);
+       }
        EXIT;
 out:
        if (rc)