Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4647 tests: modify sanity-sec to test multiple MDSes
[fs/lustre-release.git]
/
lustre
/
quota
/
qsd_lib.c
diff --git
a/lustre/quota/qsd_lib.c
b/lustre/quota/qsd_lib.c
index
573473c
..
bcbe18a
100644
(file)
--- a/
lustre/quota/qsd_lib.c
+++ b/
lustre/quota/qsd_lib.c
@@
-21,7
+21,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 201
3
, Intel Corporation.
+ * Copyright (c) 2012, 201
4
, Intel Corporation.
* Use is subject to license terms.
*
* Author: Johann Lombardi <johann.lombardi@intel.com>
* Use is subject to license terms.
*
* Author: Johann Lombardi <johann.lombardi@intel.com>
@@
-207,7
+207,7
@@
qsd_timeout_seq_write(struct file *file, const char *buffer,
}
LPROC_SEQ_FOPS(qsd_timeout);
}
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",
{ .name = "info",
.fops = &qsd_state_fops },
{ .name = "enabled",
@@
-281,8
+281,8
@@
static void qsd_qtype_fini(const struct lu_env *env, struct qsd_instance *qsd,
qsd->qsd_type_array[qtype] = NULL;
/* all deferred work lists should be empty */
qsd->qsd_type_array[qtype] = NULL;
/* all deferred work lists should be empty */
- LASSERT(
cfs_
list_empty(&qqi->qqi_deferred_glb));
- LASSERT(
cfs_
list_empty(&qqi->qqi_deferred_slv));
+ LASSERT(list_empty(&qqi->qqi_deferred_glb));
+ LASSERT(list_empty(&qqi->qqi_deferred_slv));
/* shutdown lquota site */
if (qqi->qqi_site != NULL && !IS_ERR(qqi->qqi_site)) {
/* shutdown lquota site */
if (qqi->qqi_site != NULL && !IS_ERR(qqi->qqi_site)) {
@@
-305,16
+305,16
@@
static void qsd_qtype_fini(const struct lu_env *env, struct qsd_instance *qsd,
* qsd_glb_blocking_ast() might haven't been called yet when we
* get here.
*/
* qsd_glb_blocking_ast() might haven't been called yet when we
* get here.
*/
- while (
cfs_
atomic_read(&qqi->qqi_ref) > 1) {
+ while (atomic_read(&qqi->qqi_ref) > 1) {
CDEBUG(D_QUOTA, "qqi reference count %u, repeat: %d\n",
CDEBUG(D_QUOTA, "qqi reference count %u, repeat: %d\n",
-
cfs_
atomic_read(&qqi->qqi_ref), repeat);
+ atomic_read(&qqi->qqi_ref), repeat);
repeat++;
schedule_timeout_and_set_state(TASK_INTERRUPTIBLE,
cfs_time_seconds(1));
}
/* by now, all qqi users should have gone away */
repeat++;
schedule_timeout_and_set_state(TASK_INTERRUPTIBLE,
cfs_time_seconds(1));
}
/* by now, all qqi users should have gone away */
- LASSERT(
cfs_
atomic_read(&qqi->qqi_ref) == 1);
+ LASSERT(atomic_read(&qqi->qqi_ref) == 1);
lu_ref_fini(&qqi->qqi_reference);
/* release accounting object */
lu_ref_fini(&qqi->qqi_reference);
/* release accounting object */
@@
-370,7
+370,7
@@
static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
if (qqi == NULL)
RETURN(-ENOMEM);
qsd->qsd_type_array[qtype] = qqi;
if (qqi == NULL)
RETURN(-ENOMEM);
qsd->qsd_type_array[qtype] = qqi;
-
cfs_
atomic_set(&qqi->qqi_ref, 1); /* referenced from qsd */
+ atomic_set(&qqi->qqi_ref, 1); /* referenced from qsd */
/* set backpointer and other parameters */
qqi->qqi_qsd = qsd;
/* set backpointer and other parameters */
qqi->qqi_qsd = qsd;
@@
-383,8
+383,8
@@
static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
qqi->qqi_reint = false;
init_waitqueue_head(&qqi->qqi_reint_thread.t_ctl_waitq);
thread_set_flags(&qqi->qqi_reint_thread, SVC_STOPPED);
qqi->qqi_reint = false;
init_waitqueue_head(&qqi->qqi_reint_thread.t_ctl_waitq);
thread_set_flags(&qqi->qqi_reint_thread, SVC_STOPPED);
-
CFS_
INIT_LIST_HEAD(&qqi->qqi_deferred_glb);
-
CFS_
INIT_LIST_HEAD(&qqi->qqi_deferred_slv);
+ INIT_LIST_HEAD(&qqi->qqi_deferred_glb);
+ INIT_LIST_HEAD(&qqi->qqi_deferred_slv);
/* open accounting object */
LASSERT(qqi->qqi_acct_obj == NULL);
/* open accounting object */
LASSERT(qqi->qqi_acct_obj == NULL);
@@
-512,10
+512,10
@@
void qsd_fini(const struct lu_env *env, struct qsd_instance *qsd)
/* release per-filesystem information */
if (qsd->qsd_fsinfo != NULL) {
/* release per-filesystem information */
if (qsd->qsd_fsinfo != NULL) {
-
down(&qsd->qsd_fsinfo->qfs_sem
);
+
mutex_lock(&qsd->qsd_fsinfo->qfs_mutex
);
/* remove from the list of fsinfo */
/* remove from the list of fsinfo */
-
cfs_
list_del_init(&qsd->qsd_link);
-
up(&qsd->qsd_fsinfo->qfs_sem
);
+ list_del_init(&qsd->qsd_link);
+
mutex_unlock(&qsd->qsd_fsinfo->qfs_mutex
);
qsd_put_fsinfo(qsd->qsd_fsinfo);
qsd->qsd_fsinfo = NULL;
}
qsd_put_fsinfo(qsd->qsd_fsinfo);
qsd->qsd_fsinfo = NULL;
}
@@
-554,7
+554,7
@@
EXPORT_SYMBOL(qsd_fini);
*/
struct qsd_instance *qsd_init(const struct lu_env *env, char *svname,
struct dt_device *dev,
*/
struct qsd_instance *qsd_init(const struct lu_env *env, char *svname,
struct dt_device *dev,
-
cfs_proc_dir_entry_t
*osd_proc)
+
struct proc_dir_entry
*osd_proc)
{
struct qsd_thread_info *qti = qsd_info(env);
struct qsd_instance *qsd;
{
struct qsd_thread_info *qti = qsd_info(env);
struct qsd_instance *qsd;
@@
-573,12
+573,12
@@
struct qsd_instance *qsd_init(const struct lu_env *env, char *svname,
/* generic initializations */
rwlock_init(&qsd->qsd_lock);
/* generic initializations */
rwlock_init(&qsd->qsd_lock);
-
CFS_
INIT_LIST_HEAD(&qsd->qsd_link);
+ INIT_LIST_HEAD(&qsd->qsd_link);
thread_set_flags(&qsd->qsd_upd_thread, SVC_STOPPED);
init_waitqueue_head(&qsd->qsd_upd_thread.t_ctl_waitq);
thread_set_flags(&qsd->qsd_upd_thread, SVC_STOPPED);
init_waitqueue_head(&qsd->qsd_upd_thread.t_ctl_waitq);
-
CFS_
INIT_LIST_HEAD(&qsd->qsd_upd_list);
+ INIT_LIST_HEAD(&qsd->qsd_upd_list);
spin_lock_init(&qsd->qsd_adjust_lock);
spin_lock_init(&qsd->qsd_adjust_lock);
-
CFS_
INIT_LIST_HEAD(&qsd->qsd_adjust_list);
+ INIT_LIST_HEAD(&qsd->qsd_adjust_list);
qsd->qsd_prepared = false;
qsd->qsd_started = false;
qsd->qsd_prepared = false;
qsd->qsd_started = false;
@@
-612,13
+612,13
@@
struct qsd_instance *qsd_init(const struct lu_env *env, char *svname,
}
/* add in the list of lquota_fsinfo */
}
/* add in the list of lquota_fsinfo */
-
down(&qsd->qsd_fsinfo->qfs_sem
);
+
mutex_lock(&qsd->qsd_fsinfo->qfs_mutex
);
list_add_tail(&qsd->qsd_link, &qsd->qsd_fsinfo->qfs_qsd_list);
list_add_tail(&qsd->qsd_link, &qsd->qsd_fsinfo->qfs_qsd_list);
-
up(&qsd->qsd_fsinfo->qfs_sem
);
+
mutex_unlock(&qsd->qsd_fsinfo->qfs_mutex
);
/* register procfs directory */
/* 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;
if (IS_ERR(qsd->qsd_proc)) {
rc = PTR_ERR(qsd->qsd_proc);
qsd->qsd_proc = NULL;