X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_lib.c;h=1e4236c4635d2a795d003371a2be676f8eb64b34;hp=a9307b7e03eecd5558e6e76f81b77604bdf6b27b;hb=7a814e94e065551ab79e2ba75df9626e4940efc5;hpb=0ad4f8a4227ed7dd93fec99d33c6bb25056473fc diff --git a/lustre/quota/qsd_lib.c b/lustre/quota/qsd_lib.c index a9307b7..1e4236c 100644 --- a/lustre/quota/qsd_lib.c +++ b/lustre/quota/qsd_lib.c @@ -21,7 +21,7 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, 2013, Intel Corporation. + * Copyright (c) 2012, 2014, Intel Corporation. * Use is subject to license terms. * * Author: Johann Lombardi @@ -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; @@ -160,7 +160,7 @@ lprocfs_force_reint_seq_write(struct file *file, const char *buffer, rc = -EAGAIN; } else { /* mark all indexes as stale */ - for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) { + for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) { qsd->qsd_type_array[qtype]->qqi_glb_uptodate = false; qsd->qsd_type_array[qtype]->qqi_slv_uptodate = false; } @@ -171,7 +171,7 @@ lprocfs_force_reint_seq_write(struct file *file, const char *buffer, return rc; /* kick off reintegration */ - for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) { + for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) { rc = qsd_start_reint_thread(qsd->qsd_type_array[qtype]); if (rc) break; @@ -185,21 +185,23 @@ 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; - int timeout, rc; + int rc; + __s64 timeout; LASSERT(qsd != NULL); - rc = lprocfs_write_helper(buffer, count, &timeout); + rc = lprocfs_str_to_s64(buffer, count, &timeout); if (rc) return rc; - if (timeout < 0) + if (timeout < 0 || timeout > INT_MAX) return -EINVAL; qsd->qsd_timeout = timeout; @@ -250,7 +252,7 @@ static int qsd_conn_callback(void *data) * reintegration procedure (i.e. global lock enqueue and slave * index transfer) since the space usage reconciliation (i.e. * step 3) will have to wait for qsd_start() to be called */ - for (type = USRQUOTA; type < MAXQUOTAS; type++) { + for (type = USRQUOTA; type < LL_MAXQUOTAS; type++) { struct qsd_qtype_info *qqi = qsd->qsd_type_array[type]; wake_up(&qqi->qqi_reint_thread.t_ctl_waitq); } @@ -309,8 +311,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 */ @@ -492,7 +494,7 @@ void qsd_fini(const struct lu_env *env, struct qsd_instance *qsd) qsd_stop_upd_thread(qsd); /* shutdown the reintegration threads */ - for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) { + for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) { if (qsd->qsd_type_array[qtype] == NULL) continue; qsd_stop_reint_thread(qsd->qsd_type_array[qtype]); @@ -503,7 +505,7 @@ void qsd_fini(const struct lu_env *env, struct qsd_instance *qsd) } /* free per-quota type data */ - for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) + for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) qsd_qtype_fini(env, qsd, qtype); /* deregister connection to the quota master */ @@ -618,7 +620,7 @@ struct qsd_instance *qsd_init(const struct lu_env *env, char *svname, /* register procfs directory */ qsd->qsd_proc = lprocfs_register(QSD_DIR, osd_proc, - lprocfs_quota_qsd_vars, qsd); + lprocfs_quota_qsd_vars, qsd); if (IS_ERR(qsd->qsd_proc)) { rc = PTR_ERR(qsd->qsd_proc); qsd->qsd_proc = NULL; @@ -690,7 +692,7 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd) } /* initialize per-quota type data */ - for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) { + for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) { rc = qsd_qtype_init(env, qsd, qtype); if (rc) RETURN(rc); @@ -702,7 +704,7 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd) write_unlock(&qsd->qsd_lock); /* start reintegration thread for each type, if required */ - for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) { + 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) { @@ -790,7 +792,7 @@ int qsd_start(const struct lu_env *env, struct qsd_instance *qsd) /* Trigger the 3rd step of reintegration: If usage > granted, acquire * up to usage; If usage < granted, release down to usage. */ - for (type = USRQUOTA; type < MAXQUOTAS; type++) { + for (type = USRQUOTA; type < LL_MAXQUOTAS; type++) { struct qsd_qtype_info *qqi = qsd->qsd_type_array[type]; wake_up(&qqi->qqi_reint_thread.t_ctl_waitq); }