Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39445367 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging:lustre: fixup LNet resource container api 



Both lnet_res_container_setup and lnet_res_container_create
have additional parameters that are no longer used with the
removal of the FREELIST code. This patch removes the no
longer needed function arguments.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9c90615

drivers/staging/lustre/lnet/lnet/api-ni.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -422,8 +422,7 @@ lnet_res_container_cleanup(struct lnet_res_container *rec) 
}

}





static int

static int

lnet_res_container_setup(struct lnet_res_container *rec,

lnet_res_container_setup(struct lnet_res_container *rec, int cpt, int type)

			 int cpt, int type, int objnum, int objsz)

{

{

	int rc = 0;

	int rc = 0;

	int i;

	int i;
@@ -467,7 +466,7 @@ lnet_res_containers_destroy(struct lnet_res_container **recs) 
}

}





static struct lnet_res_container **

static struct lnet_res_container **

lnet_res_containers_create(int type, int objnum, int objsz)

lnet_res_containers_create(int type)

{

{

	struct lnet_res_container **recs;

	struct lnet_res_container **recs;

	struct lnet_res_container *rec;

	struct lnet_res_container *rec;
@@ -482,7 +481,7 @@ lnet_res_containers_create(int type, int objnum, int objsz) 
	}

	}





	cfs_percpt_for_each(rec, i, recs) {

	cfs_percpt_for_each(rec, i, recs) {

		rc = lnet_res_container_setup(rec, i, type, objnum, objsz);

		rc = lnet_res_container_setup(rec, i, type);

		if (rc != 0) {

		if (rc != 0) {

			lnet_res_containers_destroy(recs);

			lnet_res_containers_destroy(recs);

			return NULL;

			return NULL;
@@ -575,11 +574,11 @@ lnet_prepare(lnet_pid_t requested_pid) 
		goto failed;

		goto failed;





	rc = lnet_res_container_setup(&the_lnet.ln_eq_container, 0,

	rc = lnet_res_container_setup(&the_lnet.ln_eq_container, 0,

				      LNET_COOKIE_TYPE_EQ, 0, 0);

				      LNET_COOKIE_TYPE_EQ);

	if (rc != 0)

	if (rc != 0)

		goto failed;

		goto failed;





	recs = lnet_res_containers_create(LNET_COOKIE_TYPE_ME, 0, 0);

	recs = lnet_res_containers_create(LNET_COOKIE_TYPE_ME);

	if (recs == NULL) {

	if (recs == NULL) {

		rc = -ENOMEM;

		rc = -ENOMEM;

		goto failed;

		goto failed;
@@ -587,7 +586,7 @@ lnet_prepare(lnet_pid_t requested_pid) 




	the_lnet.ln_me_containers = recs;

	the_lnet.ln_me_containers = recs;





	recs = lnet_res_containers_create(LNET_COOKIE_TYPE_MD, 0, 0);

	recs = lnet_res_containers_create(LNET_COOKIE_TYPE_MD);

	if (recs == NULL) {

	if (recs == NULL) {

		rc = -ENOMEM;

		rc = -ENOMEM;

		goto failed;

		goto failed;