Commit 6362abd3 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by James Bottomley
Browse files

[SCSI] Rename scsi_bidi_sdb_cache 



The data integrity changes need to dynamically allocate
scsi_data_buffers too.  Rename scsi_bidi_sdb_cache for clarity.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 09050715

drivers/scsi/scsi_lib.c

+13 −13
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static struct scsi_host_sg_pool scsi_sg_pools[] = { 
};

#undef SP



static struct kmem_cache *scsi_bidi_sdb_cache;

static struct kmem_cache *scsi_sdb_cache;



static void scsi_run_queue(struct request_queue *q);
@@ -775,7 +775,7 @@ void scsi_release_buffers(struct scsi_cmnd *cmd) 
		struct scsi_data_buffer *bidi_sdb =

			cmd->request->next_rq->special;

		scsi_free_sgtable(bidi_sdb);

		kmem_cache_free(scsi_bidi_sdb_cache, bidi_sdb);

		kmem_cache_free(scsi_sdb_cache, bidi_sdb);

		cmd->request->next_rq->special = NULL;

	}

}
@@ -1050,7 +1050,7 @@ int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask) 


	if (blk_bidi_rq(cmd->request)) {

		struct scsi_data_buffer *bidi_sdb = kmem_cache_zalloc(

			scsi_bidi_sdb_cache, GFP_ATOMIC);

			scsi_sdb_cache, GFP_ATOMIC);

		if (!bidi_sdb) {

			error = BLKPREP_DEFER;

			goto err_exit;
@@ -1692,11 +1692,11 @@ int __init scsi_init_queue(void) 
		return -ENOMEM;

	}



	scsi_bidi_sdb_cache = kmem_cache_create("scsi_bidi_sdb",

	scsi_sdb_cache = kmem_cache_create("scsi_data_buffer",

					   sizeof(struct scsi_data_buffer),

					   0, 0, NULL);

	if (!scsi_bidi_sdb_cache) {

		printk(KERN_ERR "SCSI: can't init scsi bidi sdb cache\n");

	if (!scsi_sdb_cache) {

		printk(KERN_ERR "SCSI: can't init scsi sdb cache\n");

		goto cleanup_io_context;

	}
@@ -1709,7 +1709,7 @@ int __init scsi_init_queue(void) 
		if (!sgp->slab) {

			printk(KERN_ERR "SCSI: can't init sg slab %s\n",

					sgp->name);

			goto cleanup_bidi_sdb;

			goto cleanup_sdb;

		}



		sgp->pool = mempool_create_slab_pool(SG_MEMPOOL_SIZE,
@@ -1717,13 +1717,13 @@ int __init scsi_init_queue(void) 
		if (!sgp->pool) {

			printk(KERN_ERR "SCSI: can't init sg mempool %s\n",

					sgp->name);

			goto cleanup_bidi_sdb;

			goto cleanup_sdb;

		}

	}



	return 0;



cleanup_bidi_sdb:

cleanup_sdb:

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

		struct scsi_host_sg_pool *sgp = scsi_sg_pools + i;

		if (sgp->pool)
@@ -1731,7 +1731,7 @@ int __init scsi_init_queue(void) 
		if (sgp->slab)

			kmem_cache_destroy(sgp->slab);

	}

	kmem_cache_destroy(scsi_bidi_sdb_cache);

	kmem_cache_destroy(scsi_sdb_cache);

cleanup_io_context:

	kmem_cache_destroy(scsi_io_context_cache);
@@ -1743,7 +1743,7 @@ void scsi_exit_queue(void) 
	int i;



	kmem_cache_destroy(scsi_io_context_cache);

	kmem_cache_destroy(scsi_bidi_sdb_cache);

	kmem_cache_destroy(scsi_sdb_cache);



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

		struct scsi_host_sg_pool *sgp = scsi_sg_pools + i;