X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_lib.c;h=d7e8e5c4d160ecaac98e1e4b7783b56015b19dfa;hb=af46e574eeebe23c5a6146a134fa00ee91931de3;hp=331a219eca4f2716decc566bd1a17f839d658936;hpb=c2c28f2aa5d65d889bf5d1a707fec82e8f852c86;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qsd_lib.c b/lustre/quota/qsd_lib.c
index 331a219..d7e8e5c 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 <johann.lombardi@intel.com>
@@ -207,7 +207,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 +309,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 */
@@ -554,7 +554,7 @@ EXPORT_SYMBOL(qsd_fini);
  */
 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;
@@ -617,8 +617,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;