d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The appropriate units for disk block addresses are always DEV_BSIZE,

Browse Source 
even when the underlying device has a larger sector size. Therefore,
the filesystem code should not (and with this patch does not) try to
use the underlying sector size when doing disk block address calculations.

This patch fixes problems in -current when using the swap-based
memory-disk device (mdconfig -a -t swap ...). This bugfix is not
relevant to -stable as -stable does not have the memory-disk device.

Sponsored by:	DARPA & NAI Labs.
This commit is contained in:
Kirk McKusick 2002-10-09 04:01:23 +00:00
parent 4526ed6ffb
commit b6cef5648d
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/ufs/ffs/ffs_vfsops.c
View File

@ -550,7 +550,6 @@ ffs_mountfs(devvp, mp, td, malloctype)
struct ucred *cred;
size_t strsize;
int ncount;
u_int sectorsize;
dev = devvp->v_rdev;
cred = td ? td->td_ucred : NOCRED;
@ -607,12 +606,6 @@ ffs_mountfs(devvp, mp, td, malloctype)
if (mp->mnt_iosize_max > MAXPHYS)
mp->mnt_iosize_max = MAXPHYS;
if (VOP_IOCTL(devvp, DIOCGSECTORSIZE, (caddr_t)&sectorsize,
FREAD, cred, td) != 0)
size = DEV_BSIZE;
else
size = sectorsize;
bp = NULL;
ump = NULL;
fs = NULL;
@ -621,7 +614,7 @@ ffs_mountfs(devvp, mp, td, malloctype)
* Try reading the superblock in each of its possible locations.
*/
for (i = 0; sblock_try[i] != -1; i++) {
if ((error = bread(devvp, sblock_try[i] / size, SBLOCKSIZE,
if ((error = bread(devvp, sblock_try[i] / DEV_BSIZE, SBLOCKSIZE,
cred, &bp)) != 0)
goto out;
fs = (struct fs *)bp->b_data;