"fs_id: %u }", idmap->id_client,
idmap->id_fs);
}
+ for (node = rb_first(&nodemap->nm_client_to_fs_projidmap);
+ node; node = rb_next(node)) {
+ if (cont)
+ seq_printf(m, ",\n");
+ idmap = rb_entry(node, struct lu_idmap, id_client_to_fs);
+ if (idmap != NULL)
+ seq_printf(m,
+ " { idtype: projid, client_id: %u, fs_id: %u }",
+ idmap->id_client,
+ idmap->id_fs);
+ }
up_read(&nodemap->nm_idmap_lock);
seq_printf(m, "\n");
seq_printf(m, "]\n");
{
struct lu_nodemap *nodemap;
struct lu_nid_range *range;
- struct interval_node_extent ext;
char start_nidstr[LNET_NIDSTR_SIZE];
char end_nidstr[LNET_NIDSTR_SIZE];
bool cont = false;
if (cont)
seq_printf(m, ",\n");
cont = 1;
- ext = range->rn_node.in_extent;
- libcfs_nid2str_r(ext.start, start_nidstr, sizeof(start_nidstr));
- libcfs_nid2str_r(ext.end, end_nidstr, sizeof(end_nidstr));
+ libcfs_nid2str_r(range->rn_start, start_nidstr, sizeof(start_nidstr));
+ libcfs_nid2str_r(range->rn_end, end_nidstr, sizeof(end_nidstr));
seq_printf(m, " { id: %u, start_nid: %s, end_nid: %s }",
range->rn_id, start_nidstr, end_nidstr);
}
list_for_each_entry(exp, &nodemap->nm_member_list,
exp_target_data.ted_nodemap_member) {
if (exp->exp_connection != NULL)
- libcfs_nid2str_r(exp->exp_connection->c_peer.nid,
- nidstr, sizeof(nidstr));
+ libcfs_nidstr_r(&exp->exp_connection->c_peer.nid,
+ nidstr, sizeof(nidstr));
seq_printf(m, " { nid: %s, uuid: %s },",
nidstr, exp->exp_client_uuid.uuid);
}
/**
+ * Reads and prints the squash PROJID for the given nodemap.
+ *
+ * \param m seq file in proc fs
+ * \param data unused
+ * \retval 0 success
+ */
+static int nodemap_squash_projid_seq_show(struct seq_file *m, void *data)
+{
+ struct lu_nodemap *nodemap;
+
+ mutex_lock(&active_config_lock);
+ nodemap = nodemap_lookup(m->private);
+ mutex_unlock(&active_config_lock);
+ if (IS_ERR(nodemap)) {
+ int rc = PTR_ERR(nodemap);
+
+ CERROR("cannot find nodemap '%s': rc = %d\n",
+ (char *)m->private, rc);
+ return rc;
+ }
+
+ seq_printf(m, "%u\n", nodemap->nm_squash_projid);
+ nodemap_putref(nodemap);
+ return 0;
+}
+
+/**
* Reads and prints the trusted flag for the given nodemap.
*
* \param m seq file in proc fs
static int nodemap_map_mode_seq_show(struct seq_file *m, void *data)
{
struct lu_nodemap *nodemap;
+ bool need_sep = false;
int rc;
mutex_lock(&active_config_lock);
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");
+ if (nodemap->nmf_map_mode == NODEMAP_MAP_ALL) {
+ seq_puts(m, "all\n");
+ } else {
+ if (nodemap->nmf_map_mode & NODEMAP_MAP_UID) {
+ seq_puts(m, "uid");
+ need_sep = true;
+ }
+ if (nodemap->nmf_map_mode & NODEMAP_MAP_GID) {
+ seq_puts(m, need_sep ? ",gid" : "gid");
+ need_sep = true;
+ }
+ if (nodemap->nmf_map_mode & NODEMAP_MAP_PROJID)
+ seq_puts(m, need_sep ? ",projid" : "projid");
+ seq_puts(m, "\n");
+ }
nodemap_putref(nodemap);
return 0;
return 0;
}
+/**
+ * Reads and prints the forbid_encryption flag for the given nodemap.
+ *
+ * \param m seq file in proc fs
+ * \param data unused
+ * \retval 0 success
+ */
+static int nodemap_forbid_encryption_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_forbid_encryption);
+ nodemap_putref(nodemap);
+ return 0;
+}
+
+/**
+ * Reads and prints the readonly_mount flag for the given nodemap.
+ *
+ * \param m seq file in proc fs
+ * \param data unused
+ * \retval 0 success
+ */
+static int nodemap_readonly_mount_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_readonly_mount);
+ nodemap_putref(nodemap);
+ return 0;
+}
+
static struct lprocfs_vars lprocfs_nm_module_vars[] = {
{
.name = "active",
LPROC_SEQ_FOPS_RO(nodemap_admin);
LPROC_SEQ_FOPS_RO(nodemap_squash_uid);
LPROC_SEQ_FOPS_RO(nodemap_squash_gid);
+LPROC_SEQ_FOPS_RO(nodemap_squash_projid);
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,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release
+LPROC_SEQ_FOPS_RO(nodemap_forbid_encryption);
+LPROC_SEQ_FOPS_RO(nodemap_readonly_mount);
+
+static const struct proc_ops nodemap_ranges_fops = {
+ .proc_open = nodemap_ranges_open,
+ .proc_read = seq_read,
+ .proc_lseek = seq_lseek,
+ .proc_release = single_release
};
-const struct file_operations nodemap_idmap_fops = {
- .open = nodemap_idmap_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release
+static const struct proc_ops nodemap_idmap_fops = {
+ .proc_open = nodemap_idmap_open,
+ .proc_read = seq_read,
+ .proc_lseek = seq_lseek,
+ .proc_release = single_release
};
-const struct file_operations nodemap_exports_fops = {
- .open = nodemap_exports_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release
+static const struct proc_ops nodemap_exports_fops = {
+ .proc_open = nodemap_exports_open,
+ .proc_read = seq_read,
+ .proc_lseek = seq_lseek,
+ .proc_release = single_release
};
static struct lprocfs_vars lprocfs_nodemap_vars[] = {
.fops = &nodemap_audit_mode_fops,
},
{
+ .name = "forbid_encryption",
+ .fops = &nodemap_forbid_encryption_fops,
+ },
+ {
+ .name = "readonly_mount",
+ .fops = &nodemap_readonly_mount_fops,
+ },
+ {
.name = "squash_uid",
.fops = &nodemap_squash_uid_fops,
},
.fops = &nodemap_squash_gid_fops,
},
{
+ .name = "squash_projid",
+ .fops = &nodemap_squash_projid_fops,
+ },
+ {
.name = "ranges",
.fops = &nodemap_ranges_fops,
},
.fops = &nodemap_squash_gid_fops,
},
{
+ .name = "squash_projid",
+ .fops = &nodemap_squash_projid_fops,
+ },
+ {
.name = "fileset",
.fops = &nodemap_fileset_fops,
},
.fops = &nodemap_audit_mode_fops,
},
{
+ .name = "forbid_encryption",
+ .fops = &nodemap_forbid_encryption_fops,
+ },
+ {
+ .name = "readonly_mount",
+ .fops = &nodemap_readonly_mount_fops,
+ },
+ {
NULL
}
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff