linux-kernel - RE: linux-next: manual merge of the block tree with the scsi tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <0D1E8821739E724A86F4D16902CE275C141A2C14CA@inbmail01.lsi.com>
Date:	Thu, 11 Jun 2009 11:53:21 +0530
From:	"Desai, Kashyap" <Kashyap.Desai@....com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Jens Axboe <jens.axboe@...cle.com>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"Kashyap@...l2.lsil.com" <Kashyap@...l2.lsil.com>,
	James Bottomley <James.Bottomley@...senPartnership.com>,
	Tejun Heo <tj@...nel.org>
Subject: RE: linux-next: manual merge of the block tree with the scsi tree

Jens,

I have verified those conflict fixed by Stephen R. It is just context changes. OK to patch it if it is not patched to mainline.

- Kashyap

-----Original Message-----
From: Stephen Rothwell [mailto:sfr@...b.auug.org.au] 
Sent: Wednesday, June 10, 2009 9:33 AM
To: Jens Axboe
Cc: linux-next@...r.kernel.org; linux-kernel@...r.kernel.org; Kashyap@...l2.lsil.com; Desai, Kashyap; James Bottomley; Tejun Heo
Subject: linux-next: manual merge of the block tree with the scsi tree

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
drivers/message/fusion/mptsas.c between commits
14d0f0b063f5363984dd305a792854f9c23e9e97 ("[SCSI] mpt fusion: Fixing 1078
data corruption issue for 36GB memory region") and
2f187862e579f1f5e883188cab6bd867cb60387f ("[SCSI] mpt fusion: Code
Cleanup patch") from the scsi tree and commit
b0790410300abaaf4f25f702803beff701baebf1 ("block: cleanup rq->data_len
usages") from the block tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/message/fusion/mptsas.c
index 14c490a,79f5433..0000000
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@@ -2177,32 -1319,26 +2177,32 @@@ static int mptsas_smp_handler(struct Sc
  	/* request */
  	flagsLength = (MPI_SGE_FLAGS_SIMPLE_ELEMENT |
  		       MPI_SGE_FLAGS_END_OF_BUFFER |
 -		       MPI_SGE_FLAGS_DIRECTION |
 -		       mpt_addr_size()) << MPI_SGE_FLAGS_SHIFT;
 +		       MPI_SGE_FLAGS_DIRECTION)
 +		       << MPI_SGE_FLAGS_SHIFT;
- 	flagsLength |= (req->data_len - 4);
+ 	flagsLength |= (blk_rq_bytes(req) - 4);
  
  	dma_addr_out = pci_map_single(ioc->pcidev, bio_data(req->bio),
- 				      req->data_len, PCI_DMA_BIDIRECTIONAL);
+ 				      blk_rq_bytes(req), PCI_DMA_BIDIRECTIONAL);
  	if (!dma_addr_out)
  		goto put_mf;
 -	mpt_add_sge(psge, flagsLength, dma_addr_out);
 -	psge += (sizeof(u32) + sizeof(dma_addr_t));
 +	ioc->add_sge(psge, flagsLength, dma_addr_out);
 +	psge += ioc->SGE_size;
  
  	/* response */
 -	flagsLength = MPT_SGE_FLAGS_SSIMPLE_READ;
 +	flagsLength = MPI_SGE_FLAGS_SIMPLE_ELEMENT |
 +		MPI_SGE_FLAGS_SYSTEM_ADDRESS |
 +		MPI_SGE_FLAGS_IOC_TO_HOST |
 +		MPI_SGE_FLAGS_END_OF_BUFFER;
 +
 +	flagsLength = flagsLength << MPI_SGE_FLAGS_SHIFT;
- 	flagsLength |= rsp->data_len + 4;
+ 	flagsLength |= blk_rq_bytes(rsp) + 4;
  	dma_addr_in =  pci_map_single(ioc->pcidev, bio_data(rsp->bio),
- 				      rsp->data_len, PCI_DMA_BIDIRECTIONAL);
+ 				      blk_rq_bytes(rsp), PCI_DMA_BIDIRECTIONAL);
  	if (!dma_addr_in)
  		goto unmap;
 -	mpt_add_sge(psge, flagsLength, dma_addr_in);
 +	ioc->add_sge(psge, flagsLength, dma_addr_in);
  
 +	INITIALIZE_MGMT_STATUS(ioc->sas_mgmt.status)
  	mpt_put_msg_frame(mptsasMgmtCtx, ioc, mf);
  
  	timeleft = wait_for_completion_timeout(&ioc->sas_mgmt.done, 10 * HZ);
@@@ -2221,11 -1357,10 +2221,11 @@@
  		smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply;
  		memcpy(req->sense, smprep, sizeof(*smprep));
  		req->sense_len = sizeof(*smprep);
- 		req->data_len = 0;
- 		rsp->data_len -= smprep->ResponseDataLength;
+ 		req->resid_len = 0;
+ 		rsp->resid_len -= smprep->ResponseDataLength;
  	} else {
 -		printk(MYIOC_s_ERR_FMT "%s: smp passthru reply failed to be returned\n",
 +		printk(MYIOC_s_ERR_FMT
 +		    "%s: smp passthru reply failed to be returned\n",
  		    ioc->name, __func__);
  		ret = -ENXIO;
  	}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/