Commit 33be4600 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: more conversions to GFP_KERNEL allocations. 



These are not called from filesystem context, so use
GFP_KERNEL, not LIBCFS_ALLOC().

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

drivers/staging/lustre/lnet/selftest/console.c

+25 −32
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ lstcon_node_find(struct lnet_process_id id, struct lstcon_node **ndpp, 
	if (!create)

		return -ENOENT;



	LIBCFS_ALLOC(*ndpp, sizeof(**ndpp) + sizeof(*ndl));

	*ndpp = kzalloc(sizeof(**ndpp) + sizeof(*ndl), GFP_KERNEL);

	if (!*ndpp)

		return -ENOMEM;
@@ -133,7 +133,7 @@ lstcon_node_put(struct lstcon_node *nd) 
	list_del(&ndl->ndl_link);

	list_del(&ndl->ndl_hlink);



	LIBCFS_FREE(nd, sizeof(*nd) + sizeof(*ndl));

	kfree(nd);

}



static int
@@ -199,16 +199,16 @@ lstcon_group_alloc(char *name, struct lstcon_group **grpp) 
	struct lstcon_group *grp;

	int i;



	LIBCFS_ALLOC(grp, offsetof(struct lstcon_group,

				   grp_ndl_hash[LST_NODE_HASHSIZE]));

	grp = kmalloc(offsetof(struct lstcon_group,

			       grp_ndl_hash[LST_NODE_HASHSIZE]),

		      GFP_KERNEL);

	if (!grp)

		return -ENOMEM;



	grp->grp_ref = 1;

	if (name) {

		if (strlen(name) > sizeof(grp->grp_name) - 1) {

			LIBCFS_FREE(grp, offsetof(struct lstcon_group,

				    grp_ndl_hash[LST_NODE_HASHSIZE]));

			kfree(grp);

			return -E2BIG;

		}

		strncpy(grp->grp_name, name, sizeof(grp->grp_name));
@@ -263,8 +263,7 @@ lstcon_group_decref(struct lstcon_group *grp) 
	for (i = 0; i < LST_NODE_HASHSIZE; i++)

		LASSERT(list_empty(&grp->grp_ndl_hash[i]));



	LIBCFS_FREE(grp, offsetof(struct lstcon_group,

				  grp_ndl_hash[LST_NODE_HASHSIZE]));

	kfree(grp);

}



static int
@@ -862,8 +861,8 @@ lstcon_batch_add(char *name) 
		return -ENOMEM;

	}



	LIBCFS_ALLOC(bat->bat_cli_hash,

		     sizeof(struct list_head) * LST_NODE_HASHSIZE);

	bat->bat_cli_hash = kmalloc(sizeof(struct list_head) * LST_NODE_HASHSIZE,

				    GFP_KERNEL);

	if (!bat->bat_cli_hash) {

		CERROR("Can't allocate hash for batch %s\n", name);

		kfree(bat);
@@ -871,19 +870,19 @@ lstcon_batch_add(char *name) 
		return -ENOMEM;

	}



	LIBCFS_ALLOC(bat->bat_srv_hash,

		     sizeof(struct list_head) * LST_NODE_HASHSIZE);

	bat->bat_srv_hash = kmalloc(sizeof(struct list_head) * LST_NODE_HASHSIZE,

				    GFP_KERNEL);

	if (!bat->bat_srv_hash) {

		CERROR("Can't allocate hash for batch %s\n", name);

		LIBCFS_FREE(bat->bat_cli_hash, LST_NODE_HASHSIZE);

		kfree(bat->bat_cli_hash);

		kfree(bat);



		return -ENOMEM;

	}



	if (strlen(name) > sizeof(bat->bat_name) - 1) {

		LIBCFS_FREE(bat->bat_srv_hash, LST_NODE_HASHSIZE);

		LIBCFS_FREE(bat->bat_cli_hash, LST_NODE_HASHSIZE);

		kfree(bat->bat_srv_hash);

		kfree(bat->bat_cli_hash);

		kfree(bat);

		return -E2BIG;

	}
@@ -1107,8 +1106,7 @@ lstcon_batch_destroy(struct lstcon_batch *bat) 
		lstcon_group_decref(test->tes_src_grp);

		lstcon_group_decref(test->tes_dst_grp);



		LIBCFS_FREE(test, offsetof(struct lstcon_test,

					   tes_param[test->tes_paramlen]));

		kfree(test);

	}



	LASSERT(list_empty(&bat->bat_trans_list));
@@ -1134,10 +1132,8 @@ lstcon_batch_destroy(struct lstcon_batch *bat) 
		LASSERT(list_empty(&bat->bat_srv_hash[i]));

	}



	LIBCFS_FREE(bat->bat_cli_hash,

		    sizeof(struct list_head) * LST_NODE_HASHSIZE);

	LIBCFS_FREE(bat->bat_srv_hash,

		    sizeof(struct list_head) * LST_NODE_HASHSIZE);

	kfree(bat->bat_cli_hash);

	kfree(bat->bat_srv_hash);

	kfree(bat);

}
@@ -1311,7 +1307,8 @@ lstcon_test_add(char *batch_name, int type, int loop, 
	if (dst_grp->grp_userland)

		*retp = 1;



	LIBCFS_ALLOC(test, offsetof(struct lstcon_test, tes_param[paramlen]));

	test = kzalloc(offsetof(struct lstcon_test, tes_param[paramlen]),

		       GFP_KERNEL);

	if (!test) {

		CERROR("Can't allocate test descriptor\n");

		rc = -ENOMEM;
@@ -1357,8 +1354,7 @@ lstcon_test_add(char *batch_name, int type, int loop, 
	/*  hold groups so nobody can change them */

	return rc;

out:

	if (test)

		LIBCFS_FREE(test, offsetof(struct lstcon_test, tes_param[paramlen]));

	kfree(test);



	if (dst_grp)

		lstcon_group_decref(dst_grp);
@@ -2027,8 +2023,8 @@ lstcon_console_init(void) 
	INIT_LIST_HEAD(&console_session.ses_bat_list);

	INIT_LIST_HEAD(&console_session.ses_trans_list);



	LIBCFS_ALLOC(console_session.ses_ndl_hash,

		     sizeof(struct list_head) * LST_GLOBAL_HASHSIZE);

	console_session.ses_ndl_hash =

		kmalloc(sizeof(struct list_head) * LST_GLOBAL_HASHSIZE, GFP_KERNEL);

	if (!console_session.ses_ndl_hash)

		return -ENOMEM;
@@ -2041,8 +2037,7 @@ lstcon_console_init(void) 
	rc = srpc_add_service(&lstcon_acceptor_service);

	LASSERT(rc != -EBUSY);

	if (rc) {

		LIBCFS_FREE(console_session.ses_ndl_hash,

			    sizeof(struct list_head) * LST_GLOBAL_HASHSIZE);

		kfree(console_session.ses_ndl_hash);

		return rc;

	}
@@ -2064,8 +2059,7 @@ out: 
	srpc_shutdown_service(&lstcon_acceptor_service);

	srpc_remove_service(&lstcon_acceptor_service);



	LIBCFS_FREE(console_session.ses_ndl_hash,

		    sizeof(struct list_head) * LST_GLOBAL_HASHSIZE);

	kfree(console_session.ses_ndl_hash);



	srpc_wait_service_shutdown(&lstcon_acceptor_service);
@@ -2099,8 +2093,7 @@ lstcon_console_fini(void) 
	for (i = 0; i < LST_NODE_HASHSIZE; i++)

		LASSERT(list_empty(&console_session.ses_ndl_hash[i]));



	LIBCFS_FREE(console_session.ses_ndl_hash,

		    sizeof(struct list_head) * LST_GLOBAL_HASHSIZE);

	kfree(console_session.ses_ndl_hash);



	srpc_wait_service_shutdown(&lstcon_acceptor_service);

drivers/staging/lustre/lnet/selftest/framework.c

+2 −2
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ sfw_destroy_test_instance(struct sfw_test_instance *tsi) 
		rpc = list_entry(tsi->tsi_free_rpcs.next,

				 struct srpc_client_rpc, crpc_list);

		list_del(&rpc->crpc_list);

		LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));

		kfree(rpc);

	}



clean:
@@ -1767,7 +1767,7 @@ sfw_shutdown(void) 
				 struct srpc_client_rpc, crpc_list);

		list_del(&rpc->crpc_list);



		LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));

		kfree(rpc);

	}



	for (i = 0; ; i++) {

drivers/staging/lustre/lnet/selftest/module.c

+3 −4
Original line number Diff line number Diff line
@@ -72,9 +72,7 @@ lnet_selftest_exit(void) 
				continue;

			cfs_wi_sched_destroy(lst_sched_test[i]);

		}

		LIBCFS_FREE(lst_sched_test,

			    sizeof(lst_sched_test[0]) *

			    cfs_cpt_number(lnet_cpt_table()));

		kvfree(lst_sched_test);

		lst_sched_test = NULL;

		/* fall through */

	case LST_INIT_WI_SERIAL:
@@ -103,7 +101,8 @@ lnet_selftest_init(void) 
	lst_init_step = LST_INIT_WI_SERIAL;



	nscheds = cfs_cpt_number(lnet_cpt_table());

	LIBCFS_ALLOC(lst_sched_test, sizeof(lst_sched_test[0]) * nscheds);

	lst_sched_test = kvmalloc_array(nscheds, sizeof(lst_sched_test[0]),

					GFP_KERNEL | __GFP_ZERO);

	if (!lst_sched_test)

		goto error;

drivers/staging/lustre/lnet/selftest/rpc.c

+2 −2
Original line number Diff line number Diff line
@@ -1322,8 +1322,8 @@ srpc_create_client_rpc(struct lnet_process_id peer, int service, 
{

	struct srpc_client_rpc *rpc;



	LIBCFS_ALLOC(rpc, offsetof(struct srpc_client_rpc,

				   crpc_bulk.bk_iovs[nbulkiov]));

	rpc = kzalloc(offsetof(struct srpc_client_rpc,

			       crpc_bulk.bk_iovs[nbulkiov]), GFP_KERNEL);

	if (!rpc)

		return NULL;

drivers/staging/lustre/lnet/selftest/selftest.h

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ srpc_destroy_client_rpc(struct srpc_client_rpc *rpc) 
	LASSERT(!atomic_read(&rpc->crpc_refcount));



	if (!rpc->crpc_fini)

		LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));

		kfree(rpc);

	else

		(*rpc->crpc_fini)(rpc);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE