Commit 79bd3f85 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[SCSI] More buffer->request_buffer changes 



Seem like quite a few splipped through the cracks.  Here's a patch to
update all references I could find:

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 92c0bfea

drivers/fc4/fc.c

+2 −2
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static inline void fcp_scsi_receive(fc_channel *fc, int token, int status, fc_hd 
		

		if (fcmd->data) {

			if (SCpnt->use_sg)

				dma_unmap_sg(fc->dev, (struct scatterlist *)SCpnt->buffer,

				dma_unmap_sg(fc->dev, (struct scatterlist *)SCpnt->request_buffer,

						SCpnt->use_sg,

						SCpnt->sc_data_direction);

			else
@@ -810,7 +810,7 @@ static int fcp_scsi_queue_it(fc_channel *fc, Scsi_Cmnd *SCpnt, fcp_cmnd *fcmd, i 
							     SCpnt->request_bufflen,

							     SCpnt->sc_data_direction);

			} else {

				struct scatterlist *sg = (struct scatterlist *)SCpnt->buffer;

				struct scatterlist *sg = (struct scatterlist *)SCpnt->request_buffer;

				int nents;



				FCD(("XXX: Use_sg %d %d\n", SCpnt->use_sg, sg->length))

drivers/scsi/53c7xx.c

+4 −4
Original line number Diff line number Diff line
@@ -3451,12 +3451,12 @@ create_cmd (Scsi_Cmnd *cmd) { 
    for (i = 0; cmd->use_sg ? (i < cmd->use_sg) : !i; cmd_datain += 4, 

	cmd_dataout += 4, ++i) {

	u32 vbuf = cmd->use_sg

	    ? (u32)page_address(((struct scatterlist *)cmd->buffer)[i].page)+

	      ((struct scatterlist *)cmd->buffer)[i].offset

	    ? (u32)page_address(((struct scatterlist *)cmd->request_buffer)[i].page)+

	      ((struct scatterlist *)cmd->request_buffer)[i].offset

	    : (u32)(cmd->request_buffer);

	u32 bbuf = virt_to_bus((void *)vbuf);

	u32 count = cmd->use_sg ?

	    ((struct scatterlist *)cmd->buffer)[i].length :

	    ((struct scatterlist *)cmd->request_buffer)[i].length :

	    cmd->request_bufflen;



	/*
@@ -5417,7 +5417,7 @@ insn_to_offset (Scsi_Cmnd *cmd, u32 *insn) { 


	    if ((buffers = cmd->use_sg)) {

    	    	for (offset = 0, 

		     	segment = (struct scatterlist *) cmd->buffer;

		     	segment = (struct scatterlist *) cmd->request_buffer;

    	    	     buffers && !((found = ((ptr >= (char *)page_address(segment->page)+segment->offset) && 

    	    	    	    (ptr < ((char *)page_address(segment->page)+segment->offset+segment->length)))));

    	    	     --buffers, offset += segment->length, ++segment)

drivers/scsi/NCR53C9x.c

+1 −1
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ static void esp_get_dmabufs(struct NCR_ESP *esp, Scsi_Cmnd *sp) 
			sp->SCp.ptr =

				(char *) virt_to_phys(sp->request_buffer);

	} else {

		sp->SCp.buffer = (struct scatterlist *) sp->buffer;

		sp->SCp.buffer = (struct scatterlist *) sp->request_buffer;

		sp->SCp.buffers_residual = sp->use_sg - 1;

		sp->SCp.this_residual = sp->SCp.buffer->length;

		if (esp->dma_mmu_get_scsi_sgl)

drivers/scsi/atari_NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static __inline__ void initialize_SCp(Scsi_Cmnd *cmd) 
     */



    if (cmd->use_sg) {

	cmd->SCp.buffer = (struct scatterlist *) cmd->buffer;

	cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer;

	cmd->SCp.buffers_residual = cmd->use_sg - 1;

	cmd->SCp.ptr = (char *)page_address(cmd->SCp.buffer->page)+

		       cmd->SCp.buffer->offset;

drivers/scsi/esp.c

+2 −2
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ static void esp_get_dmabufs(struct esp *esp, struct scsi_cmnd *sp) 
			sp->SCp.ptr = NULL;

		}

	} else {

		sp->SCp.buffer = (struct scatterlist *) sp->buffer;

		sp->SCp.buffer = (struct scatterlist *) sp->request_buffer;

		sp->SCp.buffers_residual = sbus_map_sg(esp->sdev,

						       sp->SCp.buffer,

						       sp->use_sg,
@@ -1410,7 +1410,7 @@ static void esp_get_dmabufs(struct esp *esp, struct scsi_cmnd *sp) 
static void esp_release_dmabufs(struct esp *esp, struct scsi_cmnd *sp)

{

	if (sp->use_sg) {

		sbus_unmap_sg(esp->sdev, sp->buffer, sp->use_sg,

		sbus_unmap_sg(esp->sdev, sp->request_buffer, sp->use_sg,

			      sp->sc_data_direction);

	} else if (sp->request_bufflen) {

		sbus_unmap_single(esp->sdev,