genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-05-17 15:28:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SCSI] Merge branch 'linus'

Browse Source 
Conflicts:
	drivers/message/fusion/mptsas.c

fixed up conflict between req->data_len accessors and mptsas driver updates.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
James Bottomley
2009-06-12 10:02:03 -05:00
parent 3860c97bd6 8ebf975608
commit 82681a318f
1794 changed files with 103334 additions and 35046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/scsi/scsi_cmnd.h
View File

@@ -270,7 +270,7 @@ static inline unsigned char scsi_get_prot_type(struct scsi_cmnd *scmd)
static inline sector_t scsi_get_lba(struct scsi_cmnd *scmd)
{
return scmd->request->sector;
return blk_rq_pos(scmd->request);
}
static inline unsigned scsi_prot_sg_count(struct scsi_cmnd *cmd)