From e1d05b746d3d734b119efc290e3ff7b52fbe5feb Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 13 Jun 1999 17:26:20 +0000 Subject: 1999-06-07 OKUJI Yoshinori * linux/dev/drivers/block/genhd.c [MACH] (mach_minor): New variable. (add_bsd_partition): New function. (bsd_disklabel_partition) [MACH]: Call add_bsd_partition. (msdos_partition) [MACH]: Set mach_minor to MINOR before calling bsd_disklabel_partition. * linux/dev/drivers/block/ide.c (do_request) [MACH]: Fix "bad access" message. --- linux/dev/drivers/block/ide.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'linux/dev') diff --git a/linux/dev/drivers/block/ide.c b/linux/dev/drivers/block/ide.c index 590f993..2342099 100644 --- a/linux/dev/drivers/block/ide.c +++ b/linux/dev/drivers/block/ide.c @@ -1577,8 +1577,14 @@ static inline void do_request (ide_hwif_t *hwif, struct request *rq) block = rq->sector; blockend = block + rq->nr_sectors; if ((blockend < block) || (blockend > drive->part[minor&PARTN_MASK].nr_sects)) { +#ifdef MACH + printk ("%s%c: bad access: block=%ld, count=%ld, blockend=%ld, nr_sects\n", + drive->name, (minor&PARTN_MASK)?'0'+(minor&PARTN_MASK):' ', + block, rq->nr_sectors, blockend, drive->part[minor&PARTN_MASK].nr_sects); +#else printk("%s%c: bad access: block=%ld, count=%ld\n", drive->name, (minor&PARTN_MASK)?'0'+(minor&PARTN_MASK):' ', block, rq->nr_sectors); +#endif goto kill_rq; } block += drive->part[minor&PARTN_MASK].start_sect + drive->sect0; -- cgit v1.2.3