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

Commit 142e301f authored by Mike Christie's avatar Mike Christie Committed by
Browse files

[SCSI] iscsi update: setup pool before using 



>From andmike@us.ibm.com:

 Ensure that pool data is setup prior to calling mempool_create as it will
 call the the alloc function during create.

Signed-off-by: default avatarMike Anderson <andmike@us.ibm.com>
Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarAlex Aizman <itn780@yahoo.com>
Signed-off-by: default avatarDmitry Yusupov <dmitry_yus@yahoo.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 5b940adf

drivers/scsi/scsi_transport_iscsi.c

+6 −7
Original line number Diff line number Diff line
@@ -530,6 +530,12 @@ mempool_zone_init(unsigned max, unsigned size, unsigned hiwat) 
	if (!zp)

		return NULL;



	zp->size = size;

	zp->hiwat = hiwat;

	INIT_LIST_HEAD(&zp->freequeue);

	spin_lock_init(&zp->freelock);

	atomic_set(&zp->allocated, 0);



	zp->pool = mempool_create(max, mempool_zone_alloc_skb,

				  mempool_zone_free_skb, zp);

	if (!zp->pool) {
@@ -537,13 +543,6 @@ mempool_zone_init(unsigned max, unsigned size, unsigned hiwat) 
		return NULL;

	}



	zp->size = size;

	zp->hiwat = hiwat;



	INIT_LIST_HEAD(&zp->freequeue);

	spin_lock_init(&zp->freelock);

	atomic_set(&zp->allocated, 0);



	return zp;

}