LU-28 fileset: add fileset mount support

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

diff --git a/lustre/quota/qsd_lib.c b/lustre/quota/qsd_lib.c
index 9c0f227..efd7840 100644 (file)
--- a/lustre/quota/qsd_lib.c
+++ b/lustre/quota/qsd_lib.c
@@ -77,7 +77,6 @@ static int qsd_state_seq_show(struct seq_file *m, void *data)
 {
        struct qsd_instance     *qsd = m->private;
        char                     enabled[5];
-       int                      rc;
 
        LASSERT(qsd != NULL);
 
@@ -89,14 +88,14 @@ static int qsd_state_seq_show(struct seq_file *m, void *data)
        if (strlen(enabled) == 0)
                strcat(enabled, "none");
 
-       rc = seq_printf(m, "target name:    %s\n"
-                       "pool ID:        %d\n"
-                       "type:           %s\n"
-                       "quota enabled:  %s\n"
-                       "conn to master: %s\n",
-                       qsd->qsd_svname, qsd->qsd_pool_id,
-                       qsd->qsd_is_md ? "md" : "dt", enabled,
-                       qsd->qsd_exp_valid ? "setup" : "not setup yet");
+       seq_printf(m, "target name:    %s\n"
+                  "pool ID:        %d\n"
+                  "type:           %s\n"
+                  "quota enabled:  %s\n"
+                  "conn to master: %s\n",
+                  qsd->qsd_svname, qsd->qsd_pool_id,
+                  qsd->qsd_is_md ? "md" : "dt", enabled,
+                  qsd->qsd_exp_valid ? "setup" : "not setup yet");
 
        if (qsd->qsd_prepared) {
                memset(enabled, 0, sizeof(enabled));
@@ -106,18 +105,18 @@ static int qsd_state_seq_show(struct seq_file *m, void *data)
                        strcat(enabled, "g");
                if (strlen(enabled) == 0)
                        strcat(enabled, "none");
-               rc += 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",
-                               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);
+               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",
+                          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);
        }
-       return rc;
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(qsd_state);
 
@@ -136,14 +135,15 @@ static int qsd_enabled_seq_show(struct seq_file *m, void *data)
        if (strlen(enabled) == 0)
                strcat(enabled, "none");
 
-       return seq_printf(m, "%s\n", enabled);
+       seq_printf(m, "%s\n", enabled);
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(qsd_enabled);
 
 /* force reintegration procedure to be executed.
  * Used for test/debugging purpose */
 static ssize_t
-lprocfs_force_reint_seq_write(struct file *file, const char *buffer,
+lprocfs_force_reint_seq_write(struct file *file, const char __user *buffer,
                                size_t count, loff_t *off)
 {
        struct qsd_instance *qsd = ((struct seq_file *)file->private_data)->private;
@@ -185,11 +185,12 @@ static int qsd_timeout_seq_show(struct seq_file *m, void *data)
        struct qsd_instance *qsd = m->private;
        LASSERT(qsd != NULL);
 
-       return seq_printf(m, "%d\n", qsd_wait_timeout(qsd));
+       seq_printf(m, "%d\n", qsd_wait_timeout(qsd));
+       return 0;
 }
 
 static ssize_t
-qsd_timeout_seq_write(struct file *file, const char *buffer,
+qsd_timeout_seq_write(struct file *file, const char __user *buffer,
                        size_t count, loff_t *off)
 {
        struct qsd_instance *qsd = ((struct seq_file *)file->private_data)->private;
@@ -207,7 +208,7 @@ qsd_timeout_seq_write(struct file *file, const char *buffer,
 }
 LPROC_SEQ_FOPS(qsd_timeout);
 
-static struct lprocfs_seq_vars lprocfs_quota_qsd_vars[] = {
+static struct lprocfs_vars lprocfs_quota_qsd_vars[] = {
        { .name =       "info",
          .fops =       &qsd_state_fops         },
        { .name =       "enabled",
@@ -309,8 +310,8 @@ static void qsd_qtype_fini(const struct lu_env *env, struct qsd_instance *qsd,
                CDEBUG(D_QUOTA, "qqi reference count %u, repeat: %d\n",
                       atomic_read(&qqi->qqi_ref), repeat);
                repeat++;
-               schedule_timeout_and_set_state(TASK_INTERRUPTIBLE,
-                                               cfs_time_seconds(1));
+               set_current_state(TASK_INTERRUPTIBLE);
+               schedule_timeout(cfs_time_seconds(1));
        }
 
        /* by now, all qqi users should have gone away */
@@ -617,8 +618,8 @@ struct qsd_instance *qsd_init(const struct lu_env *env, char *svname,
        mutex_unlock(&qsd->qsd_fsinfo->qfs_mutex);
 
        /* register procfs directory */
-       qsd->qsd_proc = lprocfs_seq_register(QSD_DIR, osd_proc,
-                                               lprocfs_quota_qsd_vars, qsd);
+       qsd->qsd_proc = lprocfs_register(QSD_DIR, osd_proc,
+                                        lprocfs_quota_qsd_vars, qsd);
        if (IS_ERR(qsd->qsd_proc)) {
                rc = PTR_ERR(qsd->qsd_proc);
                qsd->qsd_proc = NULL;