Commit 3c88bdbb authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: replace simple cases of LIBCFS_ALLOC with kzalloc. 



All usages of the form
  LIBCFS_ALLOC(variable, sizeof(variable))
or
  LIBCFS_ALLOC(variable, sizeof(variable's-type))

are changed to
  variable = kzalloc(sizeof(...), GFP_NOFS);

Similarly, all
   LIBCFS_FREE(variable, sizeof(variable))
become
   kfree(variable);

None of these need the vmalloc option, or any of the other minor
benefits of LIBCFS_ALLOC().

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ab7bc50

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c

+19 −20
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ void kiblnd_destroy_peer(struct kib_peer *peer) 
	LASSERT(kiblnd_peer_idle(peer));

	LASSERT(list_empty(&peer->ibp_tx_queue));



	LIBCFS_FREE(peer, sizeof(*peer));

	kfree(peer);



	/*

	 * NB a peer's connections keep a reference on their peer until
@@ -776,7 +776,7 @@ struct kib_conn *kiblnd_create_conn(struct kib_peer *peer, struct rdma_cm_id *cm 
		goto failed_2;

	}



	LIBCFS_FREE(init_qp_attr, sizeof(*init_qp_attr));

	kfree(init_qp_attr);



	/* 1 ref for caller and each rxmsg */

	atomic_set(&conn->ibc_refcount, 1 + IBLND_RX_MSGS(conn));
@@ -828,7 +828,7 @@ struct kib_conn *kiblnd_create_conn(struct kib_peer *peer, struct rdma_cm_id *cm 
 failed_2:

	kiblnd_destroy_conn(conn, true);

 failed_1:

	LIBCFS_FREE(init_qp_attr, sizeof(*init_qp_attr));

	kfree(init_qp_attr);

 failed_0:

	return NULL;

}
@@ -882,8 +882,7 @@ void kiblnd_destroy_conn(struct kib_conn *conn, bool free_conn) 
			    IBLND_RX_MSGS(conn) * sizeof(struct kib_rx));

	}



	if (conn->ibc_connvars)

		LIBCFS_FREE(conn->ibc_connvars, sizeof(*conn->ibc_connvars));

	kfree(conn->ibc_connvars);



	if (conn->ibc_hdev)

		kiblnd_hdev_decref(conn->ibc_hdev);
@@ -897,7 +896,7 @@ void kiblnd_destroy_conn(struct kib_conn *conn, bool free_conn) 
		atomic_dec(&net->ibn_nconns);

	}



	LIBCFS_FREE(conn, sizeof(*conn));

	kfree(conn);

}



int kiblnd_close_peer_conns_locked(struct kib_peer *peer, int why)
@@ -1299,7 +1298,7 @@ static void kiblnd_destroy_fmr_pool(struct kib_fmr_pool *fpo) 
					 frd_list) {

			list_del(&frd->frd_list);

			ib_dereg_mr(frd->frd_mr);

			LIBCFS_FREE(frd, sizeof(*frd));

			kfree(frd);

			i++;

		}

		if (i < fpo->fast_reg.fpo_pool_size)
@@ -1310,7 +1309,7 @@ static void kiblnd_destroy_fmr_pool(struct kib_fmr_pool *fpo) 
	if (fpo->fpo_hdev)

		kiblnd_hdev_decref(fpo->fpo_hdev);



	LIBCFS_FREE(fpo, sizeof(*fpo));

	kfree(fpo);

}



static void kiblnd_destroy_fmr_pool_list(struct list_head *head)
@@ -1405,14 +1404,14 @@ static int kiblnd_alloc_freg_pool(struct kib_fmr_poolset *fps, struct kib_fmr_po 
out_middle:

	if (frd->frd_mr)

		ib_dereg_mr(frd->frd_mr);

	LIBCFS_FREE(frd, sizeof(*frd));

	kfree(frd);



out:

	list_for_each_entry_safe(frd, tmp, &fpo->fast_reg.fpo_pool_list,

				 frd_list) {

		list_del(&frd->frd_list);

		ib_dereg_mr(frd->frd_mr);

		LIBCFS_FREE(frd, sizeof(*frd));

		kfree(frd);

	}



	return rc;
@@ -1464,7 +1463,7 @@ static int kiblnd_create_fmr_pool(struct kib_fmr_poolset *fps, 


out_fpo:

	kiblnd_hdev_decref(fpo->fpo_hdev);

	LIBCFS_FREE(fpo, sizeof(*fpo));

	kfree(fpo);

	return rc;

}
@@ -2011,7 +2010,7 @@ static void kiblnd_destroy_tx_pool(struct kib_pool *pool) 
		    pool->po_size * sizeof(struct kib_tx));

out:

	kiblnd_fini_pool(pool);

	LIBCFS_FREE(tpo, sizeof(*tpo));

	kfree(tpo);

}



static int kiblnd_tx_pool_size(int ncpts)
@@ -2043,7 +2042,7 @@ static int kiblnd_create_tx_pool(struct kib_poolset *ps, int size, 
	npg = DIV_ROUND_UP(size * IBLND_MSG_SIZE, PAGE_SIZE);

	if (kiblnd_alloc_pages(&tpo->tpo_tx_pages, ps->ps_cpt, npg)) {

		CERROR("Can't allocate tx pages: %d\n", npg);

		LIBCFS_FREE(tpo, sizeof(*tpo));

		kfree(tpo);

		return -ENOMEM;

	}
@@ -2263,7 +2262,7 @@ void kiblnd_hdev_destroy(struct kib_hca_dev *hdev) 
	if (hdev->ibh_cmid)

		rdma_destroy_id(hdev->ibh_cmid);



	LIBCFS_FREE(hdev, sizeof(*hdev));

	kfree(hdev);

}



/* DUMMY */
@@ -2392,7 +2391,7 @@ int kiblnd_dev_failover(struct kib_dev *dev) 
		goto out;

	}



	LIBCFS_ALLOC(hdev, sizeof(*hdev));

	hdev = kzalloc(sizeof(*hdev), GFP_NOFS);

	if (!hdev) {

		CERROR("Failed to allocate kib_hca_dev\n");

		rdma_destroy_id(cmid);
@@ -2471,7 +2470,7 @@ void kiblnd_destroy_dev(struct kib_dev *dev) 
	if (dev->ibd_hdev)

		kiblnd_hdev_decref(dev->ibd_hdev);



	LIBCFS_FREE(dev, sizeof(*dev));

	kfree(dev);

}



static struct kib_dev *kiblnd_create_dev(char *ifname)
@@ -2495,7 +2494,7 @@ static struct kib_dev *kiblnd_create_dev(char *ifname) 
		return NULL;

	}



	LIBCFS_ALLOC(dev, sizeof(*dev));

	dev = kzalloc(sizeof(*dev), GFP_NOFS);

	if (!dev)

		return NULL;
@@ -2517,7 +2516,7 @@ static struct kib_dev *kiblnd_create_dev(char *ifname) 
	rc = kiblnd_dev_failover(dev);

	if (rc) {

		CERROR("Can't initialize device: %d\n", rc);

		LIBCFS_FREE(dev, sizeof(*dev));

		kfree(dev);

		return NULL;

	}
@@ -2648,7 +2647,7 @@ static void kiblnd_shutdown(struct lnet_ni *ni) 
	net->ibn_init = IBLND_INIT_NOTHING;

	ni->ni_data = NULL;



	LIBCFS_FREE(net, sizeof(*net));

	kfree(net);



out:

	if (list_empty(&kiblnd_data.kib_devs))
@@ -2865,7 +2864,7 @@ static int kiblnd_startup(struct lnet_ni *ni) 
			return rc;

	}



	LIBCFS_ALLOC(net, sizeof(*net));

	net = kzalloc(sizeof(*net), GFP_NOFS);

	ni->ni_data = net;

	if (!net)

		goto net_failed;

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+2 −2
Original line number Diff line number Diff line
@@ -2124,7 +2124,7 @@ kiblnd_connreq_done(struct kib_conn *conn, int status) 
		 (conn->ibc_state == IBLND_CONN_PASSIVE_WAIT &&

		 peer->ibp_accepting > 0));



	LIBCFS_FREE(conn->ibc_connvars, sizeof(*conn->ibc_connvars));

	kfree(conn->ibc_connvars);

	conn->ibc_connvars = NULL;



	if (status) {
@@ -3363,7 +3363,7 @@ kiblnd_connd(void *arg) 


			reconn += kiblnd_reconnect_peer(conn->ibc_peer);

			kiblnd_peer_decref(conn->ibc_peer);

			LIBCFS_FREE(conn, sizeof(*conn));

			kfree(conn);



			spin_lock_irqsave(lock, flags);

		}

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c

+2 −2
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ int kiblnd_tunables_setup(struct lnet_ni *ni) 
	 * defaulted

	 */

	if (!ni->ni_lnd_tunables) {

		LIBCFS_ALLOC(ni->ni_lnd_tunables,

			     sizeof(*ni->ni_lnd_tunables));

		ni->ni_lnd_tunables = kzalloc(sizeof(*ni->ni_lnd_tunables),

					      GFP_NOFS);

		if (!ni->ni_lnd_tunables)

			return -ENOMEM;

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c

+11 −11
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ ksocknal_create_route(__u32 ipaddr, int port) 
{

	struct ksock_route *route;



	LIBCFS_ALLOC(route, sizeof(*route));

	route = kzalloc(sizeof(*route), GFP_NOFS);

	if (!route)

		return NULL;
@@ -93,7 +93,7 @@ ksocknal_destroy_route(struct ksock_route *route) 
	if (route->ksnr_peer)

		ksocknal_peer_decref(route->ksnr_peer);



	LIBCFS_FREE(route, sizeof(*route));

	kfree(route);

}



static int
@@ -132,7 +132,7 @@ ksocknal_create_peer(struct ksock_peer **peerp, struct lnet_ni *ni, 
	if (net->ksnn_shutdown) {

		spin_unlock_bh(&net->ksnn_lock);



		LIBCFS_FREE(peer, sizeof(*peer));

		kfree(peer);

		CERROR("Can't create peer: network shutdown\n");

		return -ESHUTDOWN;

	}
@@ -160,7 +160,7 @@ ksocknal_destroy_peer(struct ksock_peer *peer) 
	LASSERT(list_empty(&peer->ksnp_tx_queue));

	LASSERT(list_empty(&peer->ksnp_zc_req_list));



	LIBCFS_FREE(peer, sizeof(*peer));

	kfree(peer);



	/*

	 * NB a peer's connections and routes keep a reference on their peer
@@ -985,7 +985,7 @@ ksocknal_accept(struct lnet_ni *ni, struct socket *sock) 
	rc = lnet_sock_getaddr(sock, 1, &peer_ip, &peer_port);

	LASSERT(!rc);		      /* we succeeded before */



	LIBCFS_ALLOC(cr, sizeof(*cr));

	cr = kzalloc(sizeof(*cr), GFP_NOFS);

	if (!cr) {

		LCONSOLE_ERROR_MSG(0x12f, "Dropping connection request from %pI4h: memory exhausted\n",

				   &peer_ip);
@@ -1043,7 +1043,7 @@ ksocknal_create_conn(struct lnet_ni *ni, struct ksock_route *route, 


	LASSERT(active == (type != SOCKLND_CONN_NONE));



	LIBCFS_ALLOC(conn, sizeof(*conn));

	conn = kzalloc(sizeof(*conn), GFP_NOFS);

	if (!conn) {

		rc = -ENOMEM;

		goto failed_0;
@@ -1419,7 +1419,7 @@ failed_1: 
		LIBCFS_FREE(hello, offsetof(struct ksock_hello_msg,

					    kshm_ips[LNET_MAX_INTERFACES]));



	LIBCFS_FREE(conn, sizeof(*conn));

	kfree(conn);



failed_0:

	sock_release(sock);
@@ -1716,7 +1716,7 @@ ksocknal_destroy_conn(struct ksock_conn *conn) 


	ksocknal_peer_decref(conn->ksnc_peer);



	LIBCFS_FREE(conn, sizeof(*conn));

	kfree(conn);

}



int
@@ -2622,7 +2622,7 @@ ksocknal_shutdown(struct lnet_ni *ni) 
	}



	list_del(&net->ksnn_list);

	LIBCFS_FREE(net, sizeof(*net));

	kfree(net);



	ksocknal_data.ksnd_nnets--;

	if (!ksocknal_data.ksnd_nnets)
@@ -2815,7 +2815,7 @@ ksocknal_startup(struct lnet_ni *ni) 
			return rc;

	}



	LIBCFS_ALLOC(net, sizeof(*net));

	net = kzalloc(sizeof(*net), GFP_NOFS);

	if (!net)

		goto fail_0;
@@ -2877,7 +2877,7 @@ ksocknal_startup(struct lnet_ni *ni) 
	return 0;



 fail_1:

	LIBCFS_FREE(net, sizeof(*net));

	kfree(net);

 fail_0:

	if (!ksocknal_data.ksnd_nnets)

		ksocknal_base_shutdown();

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -2117,7 +2117,7 @@ ksocknal_connd(void *arg) 
			ksocknal_create_conn(cr->ksncr_ni, NULL,

					     cr->ksncr_sock, SOCKLND_CONN_NONE);

			lnet_ni_decref(cr->ksncr_ni);

			LIBCFS_FREE(cr, sizeof(*cr));

			kfree(cr);



			spin_lock_bh(connd_lock);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE