LU-8056 llite: use inode_lock to access i_mutex

[fs/lustre-release.git] / lnet / selftest / console.c

diff --git a/lnet/selftest/console.c b/lnet/selftest/console.c
index 9409da6..f951c17 100644 (file)
--- a/lnet/selftest/console.c
+++ b/lnet/selftest/console.c
@@ -205,9 +205,6 @@ lstcon_group_alloc(char *name, lstcon_group_t **grpp)
         if (grp == NULL)
                 return -ENOMEM;
 
-        memset(grp, 0, offsetof(lstcon_group_t,
-                                grp_ndl_hash[LST_NODE_HASHSIZE]));
-
         grp->grp_ref = 1;
        if (name != NULL) {
                if (strlen(name) > sizeof(grp->grp_name)-1) {
@@ -287,12 +284,6 @@ lstcon_group_find(const char *name, lstcon_group_t **grpp)
        return -ENOENT;
 }
 
-static void
-lstcon_group_put(lstcon_group_t *grp)
-{
-        lstcon_group_decref(grp);
-}
-
 static int
 lstcon_group_ndlink_find(lstcon_group_t *grp, lnet_process_id_t id,
                          lstcon_ndlink_t **ndlpp, int create)
@@ -446,7 +437,7 @@ lstcon_group_nodes_add(lstcon_group_t *grp,
         }
 
         if (rc != 0) {
-                lstcon_group_put(tmp);
+               lstcon_group_decref(tmp);
                 return rc;
         }
 
@@ -455,7 +446,7 @@ lstcon_group_nodes_add(lstcon_group_t *grp,
                                      tmp, lstcon_sesrpc_condition, &trans);
         if (rc != 0) {
                 CERROR("Can't create transaction: %d\n", rc);
-                lstcon_group_put(tmp);
+               lstcon_group_decref(tmp);
                 return rc;
         }
 
@@ -470,7 +461,7 @@ lstcon_group_nodes_add(lstcon_group_t *grp,
         lstcon_rpc_trans_destroy(trans);
 
         lstcon_group_move(tmp, grp);
-        lstcon_group_put(tmp);
+       lstcon_group_decref(tmp);
 
         return rc;
 }
@@ -520,12 +511,12 @@ lstcon_group_nodes_remove(lstcon_group_t *grp,
 
         lstcon_rpc_trans_destroy(trans);
         /* release nodes anyway, because we can't rollback status */
-        lstcon_group_put(tmp);
+       lstcon_group_decref(tmp);
 
         return rc;
 error:
         lstcon_group_move(tmp, grp);
-        lstcon_group_put(tmp);
+       lstcon_group_decref(tmp);
 
         return rc;
 }
@@ -539,7 +530,7 @@ lstcon_group_add(char *name)
         rc = (lstcon_group_find(name, &grp) == 0)? -EEXIST: 0;
         if (rc != 0) {
                 /* find a group with same name */
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
                 return rc;
         }
 
@@ -573,14 +564,14 @@ lstcon_nodes_add(char *name, int count, lnet_process_id_t __user *ids_up,
         if (grp->grp_ref > 2) {
                 /* referred by other threads or test */
                 CDEBUG(D_NET, "Group %s is busy\n", name);
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
 
                 return -EBUSY;
         }
 
        rc = lstcon_group_nodes_add(grp, count, ids_up, featp, result_up);
 
-        lstcon_group_put(grp);
+       lstcon_group_decref(grp);
 
         return rc;
 }
@@ -601,7 +592,7 @@ lstcon_group_del(char *name)
         if (grp->grp_ref > 2) {
                 /* referred by others threads or test */
                 CDEBUG(D_NET, "Group %s is busy\n", name);
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
                 return -EBUSY;
         }
 
@@ -610,7 +601,7 @@ lstcon_group_del(char *name)
                                      grp, lstcon_sesrpc_condition, &trans);
         if (rc != 0) {
                 CERROR("Can't create transaction: %d\n", rc);
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
                 return rc;
         }
 
@@ -618,10 +609,10 @@ lstcon_group_del(char *name)
 
         lstcon_rpc_trans_destroy(trans);
 
-        lstcon_group_put(grp);
+       lstcon_group_decref(grp);
         /* -ref for session, it's destroyed,
          * status can't be rolled back, destroy group anway */
-        lstcon_group_put(grp);
+       lstcon_group_decref(grp);
 
         return rc;
 }
@@ -641,7 +632,7 @@ lstcon_group_clean(char *name, int args)
         if (grp->grp_ref > 2) {
                 /* referred by test */
                 CDEBUG(D_NET, "Group %s is busy\n", name);
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
                 return -EBUSY;
         }
 
@@ -650,10 +641,10 @@ lstcon_group_clean(char *name, int args)
 
         lstcon_group_drain(grp, args);
 
-       lstcon_group_put(grp);
+       lstcon_group_decref(grp);
        /* release empty group */
        if (list_empty(&grp->grp_ndl_list))
-               lstcon_group_put(grp);
+               lstcon_group_decref(grp);
 
        return 0;
 }
@@ -675,16 +666,16 @@ lstcon_nodes_remove(char *name, int count,
         if (grp->grp_ref > 2) {
                 /* referred by test */
                 CDEBUG(D_NET, "Group %s is busy\n", name);
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
                 return -EBUSY;
         }
 
         rc = lstcon_group_nodes_remove(grp, count, ids_up, result_up);
 
-       lstcon_group_put(grp);
+       lstcon_group_decref(grp);
        /* release empty group */
        if (list_empty(&grp->grp_ndl_list))
-               lstcon_group_put(grp);
+               lstcon_group_decref(grp);
 
        return rc;
 }
@@ -705,7 +696,7 @@ lstcon_group_refresh(char *name, struct list_head __user *result_up)
         if (grp->grp_ref > 2) {
                 /* referred by test */
                 CDEBUG(D_NET, "Group %s is busy\n", name);
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
                 return -EBUSY;
         }
 
@@ -716,7 +707,7 @@ lstcon_group_refresh(char *name, struct list_head __user *result_up)
         if (rc != 0) {
                 /* local error, return */
                 CDEBUG(D_NET, "Can't create transaction: %d\n", rc);
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
                 return rc;
         }
 
@@ -726,7 +717,7 @@ lstcon_group_refresh(char *name, struct list_head __user *result_up)
 
         lstcon_rpc_trans_destroy(trans);
         /* -ref for me */
-        lstcon_group_put(grp);
+       lstcon_group_decref(grp);
 
         return rc;
 }
@@ -809,7 +800,7 @@ lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gents_p,
                 /* verbose query */
                 rc = lstcon_nodes_getent(&grp->grp_ndl_list,
                                          index_p, count_p, dents_up);
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
 
                 return rc;
         }
@@ -818,13 +809,11 @@ lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gents_p,
         LIBCFS_ALLOC(gentp, sizeof(lstcon_ndlist_ent_t));
         if (gentp == NULL) {
                 CERROR("Can't allocate ndlist_ent\n");
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
 
                 return -ENOMEM;
         }
 
-       memset(gentp, 0, sizeof(lstcon_ndlist_ent_t));
-
        list_for_each_entry(ndl, &grp->grp_ndl_list, ndl_link)
                 LST_NODE_STATE_COUNTER(ndl->ndl_node, gentp);
 
@@ -833,7 +822,7 @@ lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gents_p,
 
        LIBCFS_FREE(gentp, sizeof(lstcon_ndlist_ent_t));
 
-       lstcon_group_put(grp);
+       lstcon_group_decref(grp);
 
        return 0;
 }
@@ -985,8 +974,6 @@ lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up,
         if (entp == NULL)
                 return -ENOMEM;
 
-        memset(entp, 0, sizeof(lstcon_test_batch_ent_t));
-
         if (test == NULL) {
                 entp->u.tbe_batch.bae_ntest = bat->bat_ntest;
                 entp->u.tbe_batch.bae_state = bat->bat_state;
@@ -1118,8 +1105,8 @@ lstcon_batch_destroy(lstcon_batch_t *bat)
 
                list_del(&test->tes_link);
 
-               lstcon_group_put(test->tes_src_grp);
-               lstcon_group_put(test->tes_dst_grp);
+               lstcon_group_decref(test->tes_src_grp);
+               lstcon_group_decref(test->tes_dst_grp);
 
                LIBCFS_FREE(test, offsetof(lstcon_test_t,
                                           tes_param[test->tes_paramlen]));
@@ -1334,7 +1321,6 @@ lstcon_test_add(char *batch_name, int type, int loop,
                goto out;
        }
 
-       memset(test, 0, offsetof(lstcon_test_t, tes_param[paramlen]));
        test->tes_hdr.tsb_id    = batch->bat_hdr.tsb_id;
        test->tes_batch         = batch;
        test->tes_type          = type;
@@ -1377,10 +1363,10 @@ out:
                LIBCFS_FREE(test, offsetof(lstcon_test_t, tes_param[paramlen]));
 
        if (dst_grp != NULL)
-               lstcon_group_put(dst_grp);
+               lstcon_group_decref(dst_grp);
 
        if (src_grp != NULL)
-               lstcon_group_put(src_grp);
+               lstcon_group_decref(src_grp);
 
        return rc;
 }
@@ -1546,7 +1532,7 @@ lstcon_group_stat(char *grp_name, int timeout,
 
         rc = lstcon_ndlist_stat(&grp->grp_ndl_list, timeout, result_up);
 
-        lstcon_group_put(grp);
+       lstcon_group_decref(grp);
 
         return rc;
 }
@@ -1584,13 +1570,13 @@ lstcon_nodes_stat(int count, lnet_process_id_t __user *ids_up,
         }
 
         if (rc != 0) {
-                lstcon_group_put(tmp);
+               lstcon_group_decref(tmp);
                 return rc;
         }
 
         rc = lstcon_ndlist_stat(&tmp->grp_ndl_list, timeout, result_up);
 
-        lstcon_group_put(tmp);
+       lstcon_group_decref(tmp);
 
         return rc;
 }
@@ -1657,7 +1643,7 @@ lstcon_group_debug(int timeout, char *name,
 
         rc = lstcon_debug_ndlist(&grp->grp_ndl_list, NULL,
                                  timeout, result_up);
-        lstcon_group_put(grp);
+       lstcon_group_decref(grp);
 
         return rc;
 }
@@ -1694,14 +1680,14 @@ lstcon_nodes_debug(int timeout,
         }
 
         if (rc != 0) {
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
                 return rc;
         }
 
         rc = lstcon_debug_ndlist(&grp->grp_ndl_list, NULL,
                                  timeout, result_up);
 
-        lstcon_group_put(grp);
+       lstcon_group_decref(grp);
 
         return rc;
 }
@@ -1811,8 +1797,6 @@ lstcon_session_info(lst_sid_t __user *sid_up, int __user *key_up,
         if (entp == NULL)
                 return -ENOMEM;
 
-        memset(entp, 0, sizeof(*entp));
-
        list_for_each_entry(ndl, &console_session.ses_ndl_list, ndl_link)
                LST_NODE_STATE_COUNTER(ndl->ndl_node, entp);
 
@@ -1881,7 +1865,7 @@ lstcon_session_end()
                                 lstcon_group_t, grp_link);
                LASSERT(grp->grp_ref == 1);
 
-               lstcon_group_put(grp);
+               lstcon_group_decref(grp);
        }
 
        /* all nodes should be released */
@@ -2002,7 +1986,7 @@ lstcon_acceptor_handle (srpc_server_rpc_t *rpc)
 out:
        rep->msg_ses_feats = console_session.ses_features;
         if (grp != NULL)
-                lstcon_group_put(grp);
+               lstcon_group_decref(grp);
 
        mutex_unlock(&console_session.ses_mutex);