Remove the function lstcon_group_put() and replace all its calls with the
function lstcon_group_decref() because the former function just
performs the job of calling the latter.
Linux-commit :
33db686a22e502ba127138912814e8468ac51ed6
Change-Id: Id12aee41286fd46beb5f96f09dcc50b7e636e93e
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: http://review.whamcloud.com/18951
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
-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)
static int
lstcon_group_ndlink_find(lstcon_group_t *grp, lnet_process_id_t id,
lstcon_ndlink_t **ndlpp, int create)
+ lstcon_group_decref(tmp);
tmp, lstcon_sesrpc_condition, &trans);
if (rc != 0) {
CERROR("Can't create transaction: %d\n", rc);
tmp, lstcon_sesrpc_condition, &trans);
if (rc != 0) {
CERROR("Can't create transaction: %d\n", rc);
+ lstcon_group_decref(tmp);
lstcon_rpc_trans_destroy(trans);
lstcon_group_move(tmp, grp);
lstcon_rpc_trans_destroy(trans);
lstcon_group_move(tmp, grp);
+ lstcon_group_decref(tmp);
lstcon_rpc_trans_destroy(trans);
/* release nodes anyway, because we can't rollback status */
lstcon_rpc_trans_destroy(trans);
/* release nodes anyway, because we can't rollback status */
+ lstcon_group_decref(tmp);
return rc;
error:
lstcon_group_move(tmp, grp);
return rc;
error:
lstcon_group_move(tmp, grp);
+ lstcon_group_decref(tmp);
rc = (lstcon_group_find(name, &grp) == 0)? -EEXIST: 0;
if (rc != 0) {
/* find a group with same name */
rc = (lstcon_group_find(name, &grp) == 0)? -EEXIST: 0;
if (rc != 0) {
/* find a group with same name */
+ lstcon_group_decref(grp);
if (grp->grp_ref > 2) {
/* referred by other threads or test */
CDEBUG(D_NET, "Group %s is busy\n", name);
if (grp->grp_ref > 2) {
/* referred by other threads or test */
CDEBUG(D_NET, "Group %s is busy\n", name);
+ lstcon_group_decref(grp);
return -EBUSY;
}
rc = lstcon_group_nodes_add(grp, count, ids_up, featp, result_up);
return -EBUSY;
}
rc = lstcon_group_nodes_add(grp, count, ids_up, featp, result_up);
+ lstcon_group_decref(grp);
if (grp->grp_ref > 2) {
/* referred by others threads or test */
CDEBUG(D_NET, "Group %s is busy\n", name);
if (grp->grp_ref > 2) {
/* referred by others threads or test */
CDEBUG(D_NET, "Group %s is busy\n", name);
+ lstcon_group_decref(grp);
grp, lstcon_sesrpc_condition, &trans);
if (rc != 0) {
CERROR("Can't create transaction: %d\n", rc);
grp, lstcon_sesrpc_condition, &trans);
if (rc != 0) {
CERROR("Can't create transaction: %d\n", rc);
+ lstcon_group_decref(grp);
lstcon_rpc_trans_destroy(trans);
lstcon_rpc_trans_destroy(trans);
+ lstcon_group_decref(grp);
/* -ref for session, it's destroyed,
* status can't be rolled back, destroy group anway */
/* -ref for session, it's destroyed,
* status can't be rolled back, destroy group anway */
+ lstcon_group_decref(grp);
if (grp->grp_ref > 2) {
/* referred by test */
CDEBUG(D_NET, "Group %s is busy\n", name);
if (grp->grp_ref > 2) {
/* referred by test */
CDEBUG(D_NET, "Group %s is busy\n", name);
+ lstcon_group_decref(grp);
lstcon_group_drain(grp, args);
lstcon_group_drain(grp, args);
+ lstcon_group_decref(grp);
/* release empty group */
if (list_empty(&grp->grp_ndl_list))
/* release empty group */
if (list_empty(&grp->grp_ndl_list))
+ lstcon_group_decref(grp);
if (grp->grp_ref > 2) {
/* referred by test */
CDEBUG(D_NET, "Group %s is busy\n", name);
if (grp->grp_ref > 2) {
/* referred by test */
CDEBUG(D_NET, "Group %s is busy\n", name);
+ lstcon_group_decref(grp);
return -EBUSY;
}
rc = lstcon_group_nodes_remove(grp, count, ids_up, result_up);
return -EBUSY;
}
rc = lstcon_group_nodes_remove(grp, count, ids_up, result_up);
+ lstcon_group_decref(grp);
/* release empty group */
if (list_empty(&grp->grp_ndl_list))
/* release empty group */
if (list_empty(&grp->grp_ndl_list))
+ lstcon_group_decref(grp);
if (grp->grp_ref > 2) {
/* referred by test */
CDEBUG(D_NET, "Group %s is busy\n", name);
if (grp->grp_ref > 2) {
/* referred by test */
CDEBUG(D_NET, "Group %s is busy\n", name);
+ lstcon_group_decref(grp);
if (rc != 0) {
/* local error, return */
CDEBUG(D_NET, "Can't create transaction: %d\n", rc);
if (rc != 0) {
/* local error, return */
CDEBUG(D_NET, "Can't create transaction: %d\n", rc);
+ lstcon_group_decref(grp);
lstcon_rpc_trans_destroy(trans);
/* -ref for me */
lstcon_rpc_trans_destroy(trans);
/* -ref for me */
+ lstcon_group_decref(grp);
/* verbose query */
rc = lstcon_nodes_getent(&grp->grp_ndl_list,
index_p, count_p, dents_up);
/* verbose query */
rc = lstcon_nodes_getent(&grp->grp_ndl_list,
index_p, count_p, dents_up);
+ lstcon_group_decref(grp);
LIBCFS_ALLOC(gentp, sizeof(lstcon_ndlist_ent_t));
if (gentp == NULL) {
CERROR("Can't allocate ndlist_ent\n");
LIBCFS_ALLOC(gentp, sizeof(lstcon_ndlist_ent_t));
if (gentp == NULL) {
CERROR("Can't allocate ndlist_ent\n");
+ lstcon_group_decref(grp);
LIBCFS_FREE(gentp, sizeof(lstcon_ndlist_ent_t));
LIBCFS_FREE(gentp, sizeof(lstcon_ndlist_ent_t));
+ lstcon_group_decref(grp);
list_del(&test->tes_link);
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]));
LIBCFS_FREE(test, offsetof(lstcon_test_t,
tes_param[test->tes_paramlen]));
LIBCFS_FREE(test, offsetof(lstcon_test_t, tes_param[paramlen]));
if (dst_grp != NULL)
LIBCFS_FREE(test, offsetof(lstcon_test_t, tes_param[paramlen]));
if (dst_grp != NULL)
- lstcon_group_put(dst_grp);
+ lstcon_group_decref(dst_grp);
- lstcon_group_put(src_grp);
+ lstcon_group_decref(src_grp);
rc = lstcon_ndlist_stat(&grp->grp_ndl_list, timeout, result_up);
rc = lstcon_ndlist_stat(&grp->grp_ndl_list, timeout, result_up);
+ lstcon_group_decref(grp);
+ lstcon_group_decref(tmp);
return rc;
}
rc = lstcon_ndlist_stat(&tmp->grp_ndl_list, timeout, result_up);
return rc;
}
rc = lstcon_ndlist_stat(&tmp->grp_ndl_list, timeout, result_up);
+ lstcon_group_decref(tmp);
rc = lstcon_debug_ndlist(&grp->grp_ndl_list, NULL,
timeout, result_up);
rc = lstcon_debug_ndlist(&grp->grp_ndl_list, NULL,
timeout, result_up);
+ lstcon_group_decref(grp);
+ lstcon_group_decref(grp);
return rc;
}
rc = lstcon_debug_ndlist(&grp->grp_ndl_list, NULL,
timeout, result_up);
return rc;
}
rc = lstcon_debug_ndlist(&grp->grp_ndl_list, NULL,
timeout, result_up);
+ lstcon_group_decref(grp);
lstcon_group_t, grp_link);
LASSERT(grp->grp_ref == 1);
lstcon_group_t, grp_link);
LASSERT(grp->grp_ref == 1);
+ lstcon_group_decref(grp);
}
/* all nodes should be released */
}
/* all nodes should be released */
out:
rep->msg_ses_feats = console_session.ses_features;
if (grp != NULL)
out:
rep->msg_ses_feats = console_session.ses_features;
if (grp != NULL)
+ lstcon_group_decref(grp);
mutex_unlock(&console_session.ses_mutex);
mutex_unlock(&console_session.ses_mutex);