Merge branch 'master' into for-2.6.31
Jens Axboe [Fri, 22 May 2009 18:25:34 +0000 (20:25 +0200)]
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

12 files changed:
1  2 
block/blk-core.c
drivers/ata/libata-scsi.c
drivers/ide/ide-cd.c
drivers/mmc/card/block.c
drivers/scsi/lpfc/lpfc_scsi.c
drivers/scsi/osd/osd_initiator.c
drivers/scsi/scsi_lib.c
drivers/scsi/sd.c
drivers/scsi/sg.c
fs/bio.c
include/linux/blkdev.h
include/linux/fs.h

Simple merge
Simple merge
Simple merge
@@@ -251,9 -251,17 +251,17 @@@ static int mmc_blk_issue_rq(struct mmc_
                brq.stop.opcode = MMC_STOP_TRANSMISSION;
                brq.stop.arg = 0;
                brq.stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
 -              brq.data.blocks = req->nr_sectors;
 +              brq.data.blocks = blk_rq_sectors(req);
  
                /*
+                * The block layer doesn't support all sector count
+                * restrictions, so we need to be prepared for too big
+                * requests.
+                */
+               if (brq.data.blocks > card->host->max_blk_count)
+                       brq.data.blocks = card->host->max_blk_count;
+               /*
                 * After a read error, we redo the request one sector at a time
                 * in order to accurately determine which sectors can be read
                 * successfully.
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/bio.c
Simple merge
Simple merge
Simple merge