LU-10391 ptlrpc: change rq_peer to struct lnet_nid

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

diff --git a/lustre/ptlrpc/nodemap_storage.c b/lustre/ptlrpc/nodemap_storage.c
index 210d9d3..fcdc7cd 100644 (file)
--- a/lustre/ptlrpc/nodemap_storage.c
+++ b/lustre/ptlrpc/nodemap_storage.c
@@ -67,18 +67,6 @@ static DEFINE_MUTEX(ncf_list_lock);
 /* MGS index is different than others, others are listeners to MGS idx */
 static struct nm_config_file *nodemap_mgs_ncf;
 
-/* lu_nodemap flags */
-enum nm_flag_shifts {
-       NM_FL_ALLOW_ROOT_ACCESS = 0x1,
-       NM_FL_TRUST_CLIENT_IDS = 0x2,
-       NM_FL_DENY_UNKNOWN = 0x4,
-       NM_FL_MAP_UID = 0x8,
-       NM_FL_MAP_GID = 0x10,
-       NM_FL_ENABLE_AUDIT = 0x20,
-       NM_FL_FORBID_ENCRYPT = 0x40,
-       NM_FL_MAP_PROJID = 0x80,
-};
-
 static void nodemap_cluster_key_init(struct nodemap_key *nk, unsigned int nm_id)
 {
        nk->nk_nodemap_id = cpu_to_le32(nm_idx_set_type(nm_id,
@@ -95,7 +83,7 @@ static void nodemap_cluster_rec_init(union nodemap_rec *nr,
        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_squash_projid = cpu_to_le32(nodemap->nm_squash_projid);
-       nr->ncr.ncr_flags = cpu_to_le32(
+       nr->ncr.ncr_flags =
                (nodemap->nmf_trust_client_ids ?
                        NM_FL_TRUST_CLIENT_IDS : 0) |
                (nodemap->nmf_allow_root_access ?
@@ -111,7 +99,10 @@ static void nodemap_cluster_rec_init(union nodemap_rec *nr,
                (nodemap->nmf_enable_audit ?
                        NM_FL_ENABLE_AUDIT : 0) |
                (nodemap->nmf_forbid_encryption ?
-                       NM_FL_FORBID_ENCRYPT : 0));
+                       NM_FL_FORBID_ENCRYPT : 0);
+       nr->ncr.ncr_flags2 =
+               (nodemap->nmf_readonly_mount ?
+                       NM_FL2_READONLY_MOUNT : 0);
 }
 
 static void nodemap_idmap_key_init(struct nodemap_key *nk, unsigned int nm_id,
@@ -685,7 +676,8 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
        struct lu_nodemap *nodemap = NULL;
        enum nodemap_idx_type type;
        enum nodemap_id_type id_type;
-       u8 flags;
+       enum nm_flag_bits flags;
+       enum nm_flag2_bits flags2;
        u32 nodemap_id;
        lnet_nid_t nid[2];
        u32 map[2];
@@ -768,7 +760,7 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
                nodemap->nm_squash_projid =
                        le32_to_cpu(rec->ncr.ncr_squash_projid);
 
-               flags = le32_to_cpu(rec->ncr.ncr_flags);
+               flags = rec->ncr.ncr_flags;
                nodemap->nmf_allow_root_access =
                                        flags & NM_FL_ALLOW_ROOT_ACCESS;
                nodemap->nmf_trust_client_ids =
@@ -781,10 +773,15 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
                                         NODEMAP_MAP_GID : 0) |
                                        (flags & NM_FL_MAP_PROJID ?
                                         NODEMAP_MAP_PROJID : 0);
+               if (nodemap->nmf_map_mode == NODEMAP_MAP_BOTH_LEGACY)
+                       nodemap->nmf_map_mode = NODEMAP_MAP_BOTH;
                nodemap->nmf_enable_audit =
                                        flags & NM_FL_ENABLE_AUDIT;
                nodemap->nmf_forbid_encryption =
                                        flags & NM_FL_FORBID_ENCRYPT;
+               flags2 = rec->ncr.ncr_flags2;
+               nodemap->nmf_readonly_mount =
+                                       flags2 & NM_FL2_READONLY_MOUNT;
 
                /* The fileset should be saved otherwise it will be empty
                 * every time in case of "NODEMAP_CLUSTER_IDX". */
@@ -1354,8 +1351,9 @@ int nodemap_process_idx_pages(struct nodemap_config *config, union lu_page *lip,
 }
 EXPORT_SYMBOL(nodemap_process_idx_pages);
 
-static int nodemap_page_build(const struct lu_env *env, union lu_page *lp,
-                             size_t nob, const struct dt_it_ops *iops,
+static int nodemap_page_build(const struct lu_env *env, struct dt_object *obj,
+                             union lu_page *lp, size_t bytes,
+                             const struct dt_it_ops *iops,
                              struct dt_it *it, __u32 attr, void *arg)
 {
        struct idx_info *ii = (struct idx_info *)arg;
@@ -1365,19 +1363,19 @@ static int nodemap_page_build(const struct lu_env *env, union lu_page *lp,
        int rc;
        ENTRY;
 
-       if (nob < LIP_HDR_SIZE)
+       if (bytes < LIP_HDR_SIZE)
                return -EINVAL;
 
        /* initialize the header of the new container */
        memset(lip, 0, LIP_HDR_SIZE);
        lip->lip_magic = LIP_MAGIC;
-       nob           -= LIP_HDR_SIZE;
+       bytes -= LIP_HDR_SIZE;
 
        entry = lip->lip_entries;
        do {
-               char            *tmp_entry = entry;
-               struct dt_key   *key;
-               __u64           hash;
+               char *tmp_entry = entry;
+               struct dt_key *key;
+               __u64 hash;
                enum nodemap_idx_type key_type;
 
                /* fetch 64-bit hash value */
@@ -1389,7 +1387,7 @@ static int nodemap_page_build(const struct lu_env *env, union lu_page *lp,
                                GOTO(out, rc = 0);
                }
 
-               if (nob < size) {
+               if (bytes < size) {
                        if (lip->lip_nr == 0)
                                GOTO(out, rc = -EINVAL);
                        GOTO(out, rc = 0);
@@ -1422,7 +1420,7 @@ static int nodemap_page_build(const struct lu_env *env, union lu_page *lp,
                                        ii->ii_hash_start = hash;
 
                                entry = tmp_entry + ii->ii_recsize;
-                               nob -= size;
+                               bytes -= size;
                        }
                }