Module Name: src
Committed By: mlelstv
Date: Sun Jan 7 11:37:30 UTC 2018
Modified Files:
src/sys/dev/ata: wd.c
Log Message:
Fix block address calculation for bad sectors.
To generate a diff of this commit:
cvs rdiff -u -r1.437 -r1.438 src/sys/dev/ata/wd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.437 src/sys/dev/ata/wd.c:1.438
--- src/sys/dev/ata/wd.c:1.437 Wed Dec 13 10:24:31 2017
+++ src/sys/dev/ata/wd.c Sun Jan 7 11:37:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.437 2017/12/13 10:24:31 pgoyette Exp $ */
+/* $NetBSD: wd.c,v 1.438 2018/01/07 11:37:30 mlelstv Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.437 2017/12/13 10:24:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.438 2018/01/07 11:37:30 mlelstv Exp $");
#include "opt_ata.h"
#include "opt_wd.h"
@@ -585,9 +585,18 @@ wdstrategy(struct buf *bp)
* up failing again.
*/
if (__predict_false(!SLIST_EMPTY(&wd->sc_bslist))) {
+ struct disklabel *lp = dksc->sc_dkdev.dk_label;
struct disk_badsectors *dbs;
- daddr_t maxblk = bp->b_rawblkno +
- (bp->b_bcount / wd->sc_blksize) - 1;
+ daddr_t blkno, maxblk;
+
+ /* convert the block number to absolute */
+ if (lp->d_secsize >= DEV_BSIZE)
+ blkno = bp->b_blkno / (lp->d_secsize / DEV_BSIZE);
+ else
+ blkno = bp->b_blkno * (DEV_BSIZE / lp->d_secsize);
+ if (WDPART(bp->b_dev) != RAW_PART)
+ blkno += lp->d_partitions[WDPART(bp->b_dev)].p_offset;
+ maxblk = blkno + (bp->b_bcount / wd->sc_blksize) - 1;
mutex_enter(&wd->sc_lock);
SLIST_FOREACH(dbs, &wd->sc_bslist, dbs_next)
