Whamcloud - gitweb
LU-16322: build: Add client build support for openEuler
[fs/lustre-release.git] / lustre / ptlrpc / nodemap_lproc.c
index e6f109c..795d3bb 100644 (file)
@@ -87,6 +87,17 @@ static int nodemap_idmap_show(struct seq_file *m, void *data)
                                   "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");
@@ -104,7 +115,7 @@ static int nodemap_idmap_show(struct seq_file *m, void *data)
  */
 static int nodemap_idmap_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, nodemap_idmap_show, PDE_DATA(inode));
+       return single_open(file, nodemap_idmap_show, pde_data(inode));
 }
 
 /**
@@ -162,7 +173,7 @@ static int nodemap_ranges_show(struct seq_file *m, void *data)
  */
 static int nodemap_ranges_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, nodemap_ranges_show, PDE_DATA(inode));
+       return single_open(file, nodemap_ranges_show, pde_data(inode));
 }
 
 /**
@@ -337,8 +348,8 @@ static int nodemap_exports_show(struct seq_file *m, void *data)
        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);
@@ -361,7 +372,7 @@ static int nodemap_exports_show(struct seq_file *m, void *data)
  */
 static int nodemap_exports_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, nodemap_exports_show, PDE_DATA(inode));
+       return single_open(file, nodemap_exports_show, pde_data(inode));
 }
 
 /**
@@ -495,6 +506,33 @@ static int nodemap_squash_gid_seq_show(struct seq_file *m, void *data)
 }
 
 /**
+ * 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
@@ -558,6 +596,7 @@ static int nodemap_admin_seq_show(struct seq_file *m, void *data)
 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);
@@ -570,12 +609,21 @@ static int nodemap_map_mode_seq_show(struct seq_file *m, void *data)
                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;
@@ -662,6 +710,33 @@ static int nodemap_forbid_encryption_seq_show(struct seq_file *m, void *data)
        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",
@@ -676,11 +751,13 @@ LPROC_SEQ_FOPS_RO(nodemap_trusted);
 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);
 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,
@@ -733,6 +810,10 @@ static struct lprocfs_vars lprocfs_nodemap_vars[] = {
                .fops           = &nodemap_forbid_encryption_fops,
        },
        {
+               .name           = "readonly_mount",
+               .fops           = &nodemap_readonly_mount_fops,
+       },
+       {
                .name           = "squash_uid",
                .fops           = &nodemap_squash_uid_fops,
        },
@@ -741,6 +822,10 @@ static struct lprocfs_vars lprocfs_nodemap_vars[] = {
                .fops           = &nodemap_squash_gid_fops,
        },
        {
+               .name           = "squash_projid",
+               .fops           = &nodemap_squash_projid_fops,
+       },
+       {
                .name           = "ranges",
                .fops           = &nodemap_ranges_fops,
        },
@@ -791,6 +876,10 @@ static struct lprocfs_vars lprocfs_default_nodemap_vars[] = {
                .fops           = &nodemap_squash_gid_fops,
        },
        {
+               .name           = "squash_projid",
+               .fops           = &nodemap_squash_projid_fops,
+       },
+       {
                .name           = "fileset",
                .fops           = &nodemap_fileset_fops,
        },
@@ -807,6 +896,10 @@ static struct lprocfs_vars lprocfs_default_nodemap_vars[] = {
                .fops           = &nodemap_forbid_encryption_fops,
        },
        {
+               .name           = "readonly_mount",
+               .fops           = &nodemap_readonly_mount_fops,
+       },
+       {
                NULL
        }
 };