diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 15:05:58 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 15:05:58 +1000 |
| commit | 4d11d0af84067743984b87e2154f7a37984345a8 (patch) | |
| tree | 2df7b334c55e05cf4753de847529ee3d6af08b68 /include/scsi | |
| parent | 2e5e9c15f098e3ee692926ec514bc59ea2319434 (diff) | |
| parent | 77f6bf57ba9d2c50173536dbfdacdab27cb867ca (diff) | |
Merge commit 'block/for-next'
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
drivers/block/virtio_blk.c
drivers/ide/ide-atapi.c
drivers/ide/ide-cd.c
drivers/ide/ide-floppy.c
drivers/ide/ide-tape.c
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_cmnd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index 43b50d36925c..3878d1dc7f59 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -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) |