*/
/*
* Copyright (C) 2013, Trustees of Indiana University
+ *
+ * Copyright (c) 2014, Intel Corporation.
+ *
* Author: Joshua Walgenbach <jjw@iu.edu>
*/
*/
static int nodemap_exports_open(struct inode *inode, struct file *file)
{
- struct proc_dir_entry *dir = PDE(inode);
- struct lu_nodemap *nodemap = dir->data;
+ struct lu_nodemap *nodemap = PDE_DATA(inode);
return single_open(file, nodemap_exports_show, nodemap);
}
LPROC_SEQ_FOPS_WO_TYPE(nodemap, del_nodemap_idmap);
#endif /* NODEMAP_PROC_DEBUG */
-static struct lprocfs_seq_vars lprocfs_nm_module_vars[] = {
+static struct lprocfs_vars lprocfs_nm_module_vars[] = {
{
.name = "active",
.fops = &nodemap_active_fops,
.release = single_release
};
-static struct lprocfs_seq_vars lprocfs_nodemap_vars[] = {
+static struct lprocfs_vars lprocfs_nodemap_vars[] = {
{
.name = "id",
.fops = &nodemap_id_fops,
}
};
-static struct lprocfs_seq_vars lprocfs_default_nodemap_vars[] = {
+static struct lprocfs_vars lprocfs_default_nodemap_vars[] = {
{
.name = "id",
.fops = &nodemap_id_fops,
{
int rc = 0;
- proc_lustre_nodemap_root = lprocfs_seq_register(LUSTRE_NODEMAP_NAME,
- proc_lustre_root,
- lprocfs_nm_module_vars,
- NULL);
-
+ proc_lustre_nodemap_root = lprocfs_register(LUSTRE_NODEMAP_NAME,
+ proc_lustre_root,
+ lprocfs_nm_module_vars,
+ NULL);
if (IS_ERR(proc_lustre_nodemap_root)) {
rc = PTR_ERR(proc_lustre_nodemap_root);
CERROR("cannot create 'nodemap' directory: rc = %d\n",
rc);
proc_lustre_nodemap_root = NULL;
}
-
return rc;
}
if (is_default)
nodemap_proc_entry =
- lprocfs_seq_register(name,
- proc_lustre_nodemap_root,
- lprocfs_default_nodemap_vars,
- nodemap);
+ lprocfs_register(name, proc_lustre_nodemap_root,
+ lprocfs_default_nodemap_vars,
+ nodemap);
else
nodemap_proc_entry =
- lprocfs_seq_register(name,
- proc_lustre_nodemap_root,
- lprocfs_nodemap_vars,
- nodemap);
+ lprocfs_register(name, proc_lustre_nodemap_root,
+ lprocfs_nodemap_vars,
+ nodemap);
if (IS_ERR(nodemap_proc_entry)) {
rc = PTR_ERR(nodemap_proc_entry);