LU-11233 build: support for gcc8

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

diff --git a/lustre/ptlrpc/nodemap_storage.c b/lustre/ptlrpc/nodemap_storage.c
index 96ec978..72ce072 100644 (file)
--- a/lustre/ptlrpc/nodemap_storage.c
+++ b/lustre/ptlrpc/nodemap_storage.c
@@ -74,6 +74,7 @@ enum nm_flag_shifts {
        NM_FL_DENY_UNKNOWN = 0x4,
        NM_FL_MAP_UID_ONLY = 0x8,
        NM_FL_MAP_GID_ONLY = 0x10,
+       NM_FL_ENABLE_AUDIT = 0x20,
 };
 
 static void nodemap_cluster_key_init(struct nodemap_key *nk, unsigned int nm_id)
@@ -88,7 +89,7 @@ static void nodemap_cluster_rec_init(union nodemap_rec *nr,
 {
        CLASSERT(sizeof(nr->ncr.ncr_name) == sizeof(nodemap->nm_name));
 
-       strncpy(nr->ncr.ncr_name, nodemap->nm_name, sizeof(nodemap->nm_name));
+       strncpy(nr->ncr.ncr_name, nodemap->nm_name, sizeof(nr->ncr.ncr_name));
        nr->ncr.ncr_squash_uid = cpu_to_le32(nodemap->nm_squash_uid);
        nr->ncr.ncr_squash_gid = cpu_to_le32(nodemap->nm_squash_gid);
        nr->ncr.ncr_flags = cpu_to_le32(
@@ -101,7 +102,9 @@ static void nodemap_cluster_rec_init(union nodemap_rec *nr,
                (nodemap->nmf_map_uid_only ?
                        NM_FL_MAP_UID_ONLY : 0) |
                (nodemap->nmf_map_gid_only ?
-                       NM_FL_MAP_GID_ONLY : 0));
+                       NM_FL_MAP_GID_ONLY : 0) |
+               (nodemap->nmf_enable_audit ?
+                       NM_FL_ENABLE_AUDIT : 0));
 }
 
 static void nodemap_idmap_key_init(struct nodemap_key *nk, unsigned int nm_id,
@@ -270,7 +273,7 @@ static int nodemap_idx_insert(const struct lu_env *env,
        dt_write_lock(env, idx, 0);
 
        rc = dt_insert(env, idx, (const struct dt_rec *)nr,
-                      (const struct dt_key *)nk, th, 1);
+                      (const struct dt_key *)nk, th);
 
        nodemap_inc_version(env, idx, th);
        dt_write_unlock(env, idx);
@@ -318,7 +321,7 @@ static int nodemap_idx_update(const struct lu_env *env,
                GOTO(out_lock, rc);
 
        rc = dt_insert(env, idx, (const struct dt_rec *)nr,
-                      (const struct dt_key *)nk, th, 1);
+                      (const struct dt_key *)nk, th);
        if (rc != 0)
                GOTO(out_lock, rc);
 
@@ -710,7 +713,9 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
                              " nodemap_id=%d. nodemap config file corrupt?\n",
                              nodemap_id);
                break;
-       case NODEMAP_CLUSTER_IDX:
+       case NODEMAP_CLUSTER_IDX: {
+               struct lu_nodemap *old_nm = NULL;
+
                nodemap = cfs_hash_lookup(config->nmc_nodemap_hash,
                                          rec->ncr.ncr_name);
                if (nodemap == NULL) {
@@ -751,6 +756,19 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
                                        flags & NM_FL_MAP_UID_ONLY;
                nodemap->nmf_map_gid_only =
                                        flags & NM_FL_MAP_GID_ONLY;
+               nodemap->nmf_enable_audit =
+                                       flags & NM_FL_ENABLE_AUDIT;
+
+               /* The fileset should be saved otherwise it will be empty
+                * every time in case of "NODEMAP_CLUSTER_IDX". */
+               mutex_lock(&active_config_lock);
+               old_nm = nodemap_lookup(rec->ncr.ncr_name);
+               if (!IS_ERR(old_nm) && old_nm->nm_fileset[0] != '\0')
+                       strlcpy(nodemap->nm_fileset, old_nm->nm_fileset,
+                               sizeof(nodemap->nm_fileset));
+               mutex_unlock(&active_config_lock);
+               if (!IS_ERR(old_nm))
+                       nodemap_putref(old_nm);
 
                if (*recent_nodemap == NULL) {
                        *recent_nodemap = nodemap;
@@ -761,6 +779,7 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
                }
                nodemap_putref(nodemap);
                break;
+       }
        case NODEMAP_RANGE_IDX:
                nid[0] = le64_to_cpu(rec->nrr.nrr_start_nid);
                nid[1] = le64_to_cpu(rec->nrr.nrr_end_nid);