LU-9682 nodemap: delete nids range from nodemap correctly

[fs/lustre-release.git] / lustre / ptlrpc / nodemap_handler.c

diff --git a/lustre/ptlrpc/nodemap_handler.c b/lustre/ptlrpc/nodemap_handler.c
index 59b1734..a6ef9ca 100644 (file)
--- a/lustre/ptlrpc/nodemap_handler.c
+++ b/lustre/ptlrpc/nodemap_handler.c
@@ -28,7 +28,7 @@
  */
 #include <linux/module.h>
 #include <linux/sort.h>
-#include <lnet/nidstr.h>
+#include <uapi/linux/lnet/nidstr.h>
 #include <lustre_net.h>
 #include <lustre_acl.h>
 #include <lustre_eacl.h>
@@ -265,7 +265,7 @@ struct lu_nodemap *nodemap_classify_nid(lnet_nid_t nid)
 
        /* don't use 0@lo, use the first non-lo local NID instead */
        if (LNET_NETTYP(LNET_NIDNET(nid)) == LOLND) {
-               lnet_process_id_t id;
+               struct lnet_process_id id;
                int i = 0;
 
                do {
@@ -638,6 +638,12 @@ __u32 nodemap_map_id(struct lu_nodemap *nodemap,
        if (unlikely(nodemap == NULL))
                goto out;
 
+       if (nodemap->nmf_map_uid_only && id_type == NODEMAP_GID)
+               goto out;
+
+       if (nodemap->nmf_map_gid_only && id_type == NODEMAP_UID)
+               goto out;
+
        if (id == 0) {
                if (nodemap->nmf_allow_root_access)
                        goto out;
@@ -690,7 +696,7 @@ ssize_t nodemap_map_acl(struct lu_nodemap *nodemap, void *buf, size_t size,
                        enum nodemap_tree_type tree_type)
 {
        posix_acl_xattr_header  *header = buf;
-       posix_acl_xattr_entry   *entry = &header->a_entries[0];
+       posix_acl_xattr_entry   *entry = GET_POSIX_ACL_XATTR_ENTRY(header);
        posix_acl_xattr_entry   *new_entry = entry;
        posix_acl_xattr_entry   *end;
        int                      count;
@@ -822,7 +828,7 @@ EXPORT_SYMBOL(nodemap_add_range);
 /**
  * delete a range
  * \param      name            nodemap name
- * \param      range_str       string containing range
+ * \param      nid             nid range
  * \retval     0 on success
  *
  * Delete range from global range tree, and remove it
@@ -850,6 +856,10 @@ int nodemap_del_range(const char *name, const lnet_nid_t nid[2])
                up_write(&active_config->nmc_range_tree_lock);
                GOTO(out_putref, rc = -EINVAL);
        }
+       if (range->rn_nodemap != nodemap) {
+               up_write(&active_config->nmc_range_tree_lock);
+               GOTO(out_putref, rc = -EINVAL);
+       }
        rc = nodemap_idx_range_del(range);
        range_delete(&active_config->nmc_range_tree, range);
        nm_member_reclassify_nodemap(nodemap);
@@ -1012,6 +1022,8 @@ struct lu_nodemap *nodemap_create(const char *name,
                nodemap->nmf_trust_client_ids = 0;
                nodemap->nmf_allow_root_access = 0;
                nodemap->nmf_deny_unknown = 0;
+               nodemap->nmf_map_uid_only = 0;
+               nodemap->nmf_map_gid_only = 0;
 
                nodemap->nm_squash_uid = NODEMAP_NOBODY_UID;
                nodemap->nm_squash_gid = NODEMAP_NOBODY_GID;
@@ -1025,6 +1037,10 @@ struct lu_nodemap *nodemap_create(const char *name,
                                default_nodemap->nmf_allow_root_access;
                nodemap->nmf_deny_unknown =
                                default_nodemap->nmf_deny_unknown;
+               nodemap->nmf_map_uid_only =
+                               default_nodemap->nmf_map_uid_only;
+               nodemap->nmf_map_gid_only =
+                               default_nodemap->nmf_map_gid_only;
 
                nodemap->nm_squash_uid = default_nodemap->nm_squash_uid;
                nodemap->nm_squash_gid = default_nodemap->nm_squash_gid;
@@ -1123,6 +1139,42 @@ out:
 }
 EXPORT_SYMBOL(nodemap_set_trust_client_ids);
 
+int nodemap_set_mapping_mode(const char *name, enum nodemap_mapping_modes mode)
+{
+       struct lu_nodemap       *nodemap = NULL;
+       int                     rc = 0;
+
+       mutex_lock(&active_config_lock);
+       nodemap = nodemap_lookup(name);
+       mutex_unlock(&active_config_lock);
+       if (IS_ERR(nodemap))
+               GOTO(out, rc = PTR_ERR(nodemap));
+
+       switch (mode) {
+       case NODEMAP_MAP_BOTH:
+               nodemap->nmf_map_uid_only = 0;
+               nodemap->nmf_map_gid_only = 0;
+               break;
+       case NODEMAP_MAP_UID_ONLY:
+               nodemap->nmf_map_uid_only = 1;
+               nodemap->nmf_map_gid_only = 0;
+               break;
+       case NODEMAP_MAP_GID_ONLY:
+               nodemap->nmf_map_uid_only = 0;
+               nodemap->nmf_map_gid_only = 1;
+               break;
+       default:
+               CWARN("cannot set unknown mapping mode, mode = %d\n", mode);
+       }
+       rc = nodemap_idx_nodemap_update(nodemap);
+
+       nm_member_revoke_locks(nodemap);
+       nodemap_putref(nodemap);
+out:
+       return rc;
+}
+EXPORT_SYMBOL(nodemap_set_mapping_mode);
+
 /**
  * Update the squash_uid for a nodemap.
  *