LU-14628 ptlrpc: remove might_sleep() in sptlrpc_gc_del_sec()

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

diff --git a/lustre/ptlrpc/nodemap_storage.c b/lustre/ptlrpc/nodemap_storage.c
index e22ea72..ef559ca 100644 (file)
--- a/lustre/ptlrpc/nodemap_storage.c
+++ b/lustre/ptlrpc/nodemap_storage.c
@@ -75,6 +75,7 @@ enum nm_flag_shifts {
        NM_FL_MAP_UID_ONLY = 0x8,
        NM_FL_MAP_GID_ONLY = 0x10,
        NM_FL_ENABLE_AUDIT = 0x20,
+       NM_FL_FORBID_ENCRYPT = 0x40,
 };
 
 static void nodemap_cluster_key_init(struct nodemap_key *nk, unsigned int nm_id)
@@ -104,7 +105,9 @@ static void nodemap_cluster_rec_init(union nodemap_rec *nr,
                (nodemap->nmf_map_gid_only ?
                        NM_FL_MAP_GID_ONLY : 0) |
                (nodemap->nmf_enable_audit ?
-                       NM_FL_ENABLE_AUDIT : 0));
+                       NM_FL_ENABLE_AUDIT : 0) |
+               (nodemap->nmf_forbid_encryption ?
+                       NM_FL_FORBID_ENCRYPT : 0));
 }
 
 static void nodemap_idmap_key_init(struct nodemap_key *nk, unsigned int nm_id,
@@ -757,6 +760,8 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
                                        flags & NM_FL_MAP_GID_ONLY;
                nodemap->nmf_enable_audit =
                                        flags & NM_FL_ENABLE_AUDIT;
+               nodemap->nmf_forbid_encryption =
+                                       flags & NM_FL_FORBID_ENCRYPT;
 
                /* The fileset should be saved otherwise it will be empty
                 * every time in case of "NODEMAP_CLUSTER_IDX". */
@@ -1014,8 +1019,8 @@ struct dt_object *nodemap_save_config_cache(const struct lu_env *env,
                list_for_each_entry_safe(range, range_temp, &nodemap->nm_ranges,
                                         rn_list) {
                        lnet_nid_t nid[2] = {
-                               range->rn_node.in_extent.start,
-                               range->rn_node.in_extent.end
+                               range->rn_start,
+                               range->rn_end
                        };
                        nodemap_range_key_init(&nk, nodemap->nm_id,
                                               range->rn_id);