LU-9679 nrs: remove ts_opcodes bitmap.

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

diff --git a/lustre/ptlrpc/nrs_tbf.c b/lustre/ptlrpc/nrs_tbf.c
index 31079ae..76c8e4c 100644 (file)
--- a/lustre/ptlrpc/nrs_tbf.c
+++ b/lustre/ptlrpc/nrs_tbf.c
@@ -630,7 +630,7 @@ nrs_tbf_jobid_hash_lookup(struct cfs_hash *hs,
        if (hnode == NULL)
                return NULL;
 
-       cli = container_of0(hnode, struct nrs_tbf_client, tc_hnode);
+       cli = container_of(hnode, struct nrs_tbf_client, tc_hnode);
        if (!list_empty(&cli->tc_lru))
                list_del_init(&cli->tc_lru);
        return cli;
@@ -713,8 +713,8 @@ nrs_tbf_jobid_cli_put(struct nrs_tbf_head *head,
        cfs_hash_bd_unlock(head->th_cli_hash, &bd, 1);
 
        while (!list_empty(&zombies)) {
-               cli = container_of0(zombies.next,
-                                   struct nrs_tbf_client, tc_lru);
+               cli = container_of(zombies.next,
+                                  struct nrs_tbf_client, tc_lru);
                list_del_init(&cli->tc_lru);
                nrs_tbf_cli_fini(cli);
        }
@@ -1396,7 +1396,7 @@ nrs_tbf_cli_hash_lookup(struct cfs_hash *hs, struct cfs_hash_bd *bd,
        if (hnode == NULL)
                return NULL;
 
-       cli = container_of0(hnode, struct nrs_tbf_client, tc_hnode);
+       cli = container_of(hnode, struct nrs_tbf_client, tc_hnode);
        if (!list_empty(&cli->tc_lru))
                list_del_init(&cli->tc_lru);
        return cli;
@@ -1720,8 +1720,8 @@ nrs_tbf_cli_put(struct nrs_tbf_head *head, struct nrs_tbf_client *cli)
        cfs_hash_bd_unlock(head->th_cli_hash, &bd, 1);
 
        while (!list_empty(&zombies)) {
-               cli = container_of0(zombies.next,
-                                   struct nrs_tbf_client, tc_lru);
+               cli = container_of(zombies.next,
+                                  struct nrs_tbf_client, tc_lru);
                list_del_init(&cli->tc_lru);
                nrs_tbf_cli_fini(cli);
        }
@@ -2182,7 +2182,6 @@ nrs_tbf_opcode_startup(struct ptlrpc_nrs_policy *policy,
        if (head->th_cli_hash == NULL)
                return -ENOMEM;
 
-       start.u.tc_start.ts_opcodes = NULL;
        start.u.tc_start.ts_opcodes_str = "*";
 
        start.u.tc_start.ts_rpc_rate = tbf_rate;
@@ -2265,7 +2264,7 @@ nrs_tbf_opcode_list_parse(char *str, int len, struct cfs_bitmap **bitmaptr)
                        break;
        }
 
-       if (rc == 0)
+       if (rc == 0 && bitmaptr)
                *bitmaptr = opcodes;
        else
                CFS_FREE_BITMAP(opcodes);
@@ -2275,9 +2274,6 @@ nrs_tbf_opcode_list_parse(char *str, int len, struct cfs_bitmap **bitmaptr)
 
 static void nrs_tbf_opcode_cmd_fini(struct nrs_tbf_cmd *cmd)
 {
-       if (cmd->u.tc_start.ts_opcodes)
-               CFS_FREE_BITMAP(cmd->u.tc_start.ts_opcodes);
-
        if (cmd->u.tc_start.ts_opcodes_str)
                OBD_FREE(cmd->u.tc_start.ts_opcodes_str,
                         strlen(cmd->u.tc_start.ts_opcodes_str) + 1);
@@ -2304,7 +2300,7 @@ static int nrs_tbf_opcode_parse(struct nrs_tbf_cmd *cmd, char *id)
        /* parse opcode list */
        rc = nrs_tbf_opcode_list_parse(cmd->u.tc_start.ts_opcodes_str,
                                       strlen(cmd->u.tc_start.ts_opcodes_str),
-                                      &cmd->u.tc_start.ts_opcodes);
+                                      NULL);
        if (rc)
                nrs_tbf_opcode_cmd_fini(cmd);
 
@@ -2337,7 +2333,7 @@ static int nrs_tbf_opcode_rule_init(struct ptlrpc_nrs_policy *policy,
                strlen(start->u.tc_start.ts_opcodes_str) + 1);
 
        /* Default rule '*' */
-       if (start->u.tc_start.ts_opcodes == NULL)
+       if (strcmp(start->u.tc_start.ts_opcodes_str, "*") == 0)
                return 0;
 
        rc = nrs_tbf_opcode_list_parse(rule->tr_opcodes_str,
@@ -3673,8 +3669,9 @@ static int nrs_tbf_lprocfs_init(struct ptlrpc_service *svc)
        if (!svc->srv_debugfs_entry)
                return 0;
 
-       return ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_tbf_lprocfs_vars,
-                                NULL);
+       ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_tbf_lprocfs_vars, NULL);
+
+       return 0;
 }
 
 /**