summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorreinoud <reinoud@NetBSD.org>2006-09-11 17:57:07 +0000
committerreinoud <reinoud@NetBSD.org>2006-09-11 17:57:07 +0000
commit5411355304ea12bbec8beca3f7850d83afeba1dd (patch)
tree82861613f4c3752efc3bbb906f92048af3a0092e /sys/dev
parentdcc5a66350a8b2d0504da380733dbafc14358cda (diff)
Don't add one to the capacity returned of READ CAPACITY! it results in
reporting a sd* disc that is one sector too big (!) Normally not much a problem in FFS since its clustered but other filingsystems *do* care.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/scsipi/scsipi_base.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/scsipi/scsipi_base.c b/sys/dev/scsipi/scsipi_base.c
index 89719f0e19d..8a053dd4c92 100644
--- a/sys/dev/scsipi/scsipi_base.c
+++ b/sys/dev/scsipi/scsipi_base.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_base.c,v 1.135 2006/04/17 14:30:40 nathanw Exp $ */
+/* $NetBSD: scsipi_base.c,v 1.136 2006/09/11 17:57:07 reinoud Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.135 2006/04/17 14:30:40 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.136 2006/09/11 17:57:07 reinoud Exp $");
#include "opt_scsi.h"
@@ -1049,7 +1049,7 @@ scsipi_size(struct scsipi_periph *periph, int flags)
return (0);
if (_4btol(data.data.addr) != 0xffffffff)
- return (_4btol(data.data.addr) + 1);
+ return _4btol(data.data.addr);
/*
* Device is larger than can be reflected by READ CAPACITY (10).
@@ -1067,7 +1067,7 @@ scsipi_size(struct scsipi_periph *periph, int flags)
flags | XS_CTL_DATA_IN | XS_CTL_DATA_ONSTACK | XS_CTL_SILENT) != 0)
return (0);
- return (_8btol(data.data16.addr) + 1);
+ return _8btol(data.data16.addr);
}
/*