/*
* Copyright (C) 2013, Trustees of Indiana University
*
- * Copyright (c) 2014, 2015, Intel Corporation.
+ * Copyright (c) 2014, 2017, Intel Corporation.
*
* Author: Joshua Walgenbach <jjw@iu.edu>
*/
}
seq_printf(m, "[\n");
- read_lock(&nodemap->nm_idmap_lock);
+ down_read(&nodemap->nm_idmap_lock);
for (node = rb_first(&nodemap->nm_client_to_fs_uidmap); node;
node = rb_next(node)) {
if (cont)
"fs_id: %u }", idmap->id_client,
idmap->id_fs);
}
- read_unlock(&nodemap->nm_idmap_lock);
+ up_read(&nodemap->nm_idmap_lock);
seq_printf(m, "\n");
seq_printf(m, "]\n");
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
+ char *nm_fileset;
int rc = 0;
+ ENTRY;
- if (count > 0)
- rc = nodemap_set_fileset(m->private, buffer);
+ if (count == 0)
+ RETURN(0);
+
+ if (count > PATH_MAX)
+ RETURN(-EINVAL);
+
+ OBD_ALLOC(nm_fileset, count + 1);
+ /* OBD_ALLOC zero-fills the buffer */
+ if (nm_fileset == NULL)
+ RETURN(-ENOMEM);
+
+ if (copy_from_user(nm_fileset, buffer, count))
+ GOTO(out, rc = -EFAULT);
+ rc = nodemap_set_fileset(m->private, nm_fileset);
if (rc != 0)
- return -EINVAL;
+ GOTO(out, rc = -EINVAL);
- return count;
+ rc = count;
+out:
+ OBD_FREE(nm_fileset, count + 1);
+
+ return rc;
}
LPROC_SEQ_FOPS(nodemap_fileset);
}
/**
+ * Reads and prints the mapping mode for the given nodemap.
+ *
+ * \param m seq file in proc fs
+ * \param data unused
+ * \retval 0 success
+ */
+static int nodemap_map_mode_seq_show(struct seq_file *m, void *data)
+{
+ struct lu_nodemap *nodemap;
+ int rc;
+
+ mutex_lock(&active_config_lock);
+ nodemap = nodemap_lookup(m->private);
+ mutex_unlock(&active_config_lock);
+ if (IS_ERR(nodemap)) {
+ rc = PTR_ERR(nodemap);
+ CERROR("cannot find nodemap '%s': rc = %d\n",
+ (char *)m->private, rc);
+ return rc;
+ }
+
+ if (nodemap->nmf_map_uid_only)
+ seq_printf(m, "uid_only\n");
+ else if (nodemap->nmf_map_gid_only)
+ seq_printf(m, "gid_only\n");
+ else
+ seq_printf(m, "both\n");
+
+ nodemap_putref(nodemap);
+ return 0;
+}
+
+/**
* Reads and prints the deny_unknown flag for the given nodemap.
*
* \param m seq file in proc fs
return 0;
}
+/**
+ * Reads and prints the audit_mode flag for the given nodemap.
+ *
+ * \param m seq file in proc fs
+ * \param data unused
+ * \retval 0 success
+ */
+static int nodemap_audit_mode_seq_show(struct seq_file *m, void *data)
+{
+ struct lu_nodemap *nodemap;
+ int rc;
+
+ mutex_lock(&active_config_lock);
+ nodemap = nodemap_lookup(m->private);
+ mutex_unlock(&active_config_lock);
+ if (IS_ERR(nodemap)) {
+ rc = PTR_ERR(nodemap);
+ CERROR("cannot find nodemap '%s': rc = %d\n",
+ (char *)m->private, rc);
+ return rc;
+ }
+
+ seq_printf(m, "%d\n", (int)nodemap->nmf_enable_audit);
+ nodemap_putref(nodemap);
+ return 0;
+}
+
#ifdef NODEMAP_PROC_DEBUG
/**
* Helper functions to set nodemap flags.
return rc;
}
-LPROC_SEQ_FOPS_WO_TYPE(nodemap, add_nodemap);
+LPROC_SEQ_FOPS_WR_ONLY(nodemap, add_nodemap);
/**
* Delete a nodemap.
return rc;
}
-LPROC_SEQ_FOPS_WO_TYPE(nodemap, del_nodemap);
+LPROC_SEQ_FOPS_WR_ONLY(nodemap, del_nodemap);
/**
* Helper function to parse a NID string.
&nidlist) <= 0)
return -EINVAL;
- if (!cfs_nidrange_is_contiguous(&nidlist))
- return -EINVAL;
+ rc = cfs_nidrange_find_min_max(&nidlist, nidstr[0], nidstr[1],
+ LNET_NIDSTR_SIZE);
+ if (rc < 0)
+ return rc;
- cfs_nidrange_find_min_max(&nidlist, nidstr[0], nidstr[1],
- LNET_NIDSTR_SIZE);
snprintf(nidrange_str, sizeof(nidrange_str), "%s:%s",
nidstr[0], nidstr[1]);
out:
return rc;
}
-LPROC_SEQ_FOPS_WO_TYPE(nodemap, add_nodemap_range);
+LPROC_SEQ_FOPS_WR_ONLY(nodemap, add_nodemap_range);
/**
* Delete a NID range from nodemap.
out:
return rc;
}
-LPROC_SEQ_FOPS_WO_TYPE(nodemap, del_nodemap_range);
+LPROC_SEQ_FOPS_WR_ONLY(nodemap, del_nodemap_range);
/**
* Add an idmap to nodemap.
out:
return rc;
}
-LPROC_SEQ_FOPS_WO_TYPE(nodemap, add_nodemap_idmap);
+LPROC_SEQ_FOPS_WR_ONLY(nodemap, add_nodemap_idmap);
/**
* Delete an idmap from nodemap.
out:
return rc;
}
-LPROC_SEQ_FOPS_WO_TYPE(nodemap, del_nodemap_idmap);
+LPROC_SEQ_FOPS_WR_ONLY(nodemap, del_nodemap_idmap);
#endif /* NODEMAP_PROC_DEBUG */
static struct lprocfs_vars lprocfs_nm_module_vars[] = {
#endif
LPROC_SEQ_FOPS_RO(nodemap_deny_unknown);
+LPROC_SEQ_FOPS_RO(nodemap_map_mode);
+LPROC_SEQ_FOPS_RO(nodemap_audit_mode);
const struct file_operations nodemap_ranges_fops = {
.open = nodemap_ranges_open,
.fops = &nodemap_deny_unknown_fops,
},
{
+ .name = "map_mode",
+ .fops = &nodemap_map_mode_fops,
+ },
+ {
+ .name = "audit_mode",
+ .fops = &nodemap_audit_mode_fops,
+ },
+ {
.name = "squash_uid",
.fops = &nodemap_squash_uid_fops,
},
.fops = &nodemap_squash_gid_fops,
},
{
+ .name = "fileset",
+ .fops = &nodemap_fileset_fops,
+ },
+ {
.name = "exports",
.fops = &nodemap_exports_fops,
},
{
+ .name = "audit_mode",
+ .fops = &nodemap_audit_mode_fops,
+ },
+ {
NULL
}
};