diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2002-04-02 11:23:14 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2002-04-02 11:23:14 +0000 |
| commit | 46a67eacede2124ba0dc147375e4b8f539dcbc5e (patch) | |
| tree | 1185eea4e40554c9e1ca4bf8274686061146f2eb /sys | |
| parent | ffee6e99f646b3ec6950234c4e0fd7d1979be628 (diff) | |
| download | src-46a67eacede2124ba0dc147375e4b8f539dcbc5e.tar.gz src-46a67eacede2124ba0dc147375e4b8f539dcbc5e.zip | |
Use DIOCGSECTORSIZE instead of the bogus DIOCGPART ioctl.
Notes
Notes:
svn path=/head/; revision=93654
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index b283489bf5f5..f02c809952b3 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -383,10 +383,10 @@ ffs_reload(mp, cred, td) void *space; struct buf *bp; struct fs *fs, *newfs; - struct partinfo dpart; dev_t dev; int i, blks, size, error; int32_t *lp; + u_int sectorsize; if ((mp->mnt_flag & MNT_RDONLY) == 0) return (EINVAL); @@ -416,10 +416,11 @@ ffs_reload(mp, cred, td) /* * Step 2: re-read superblock from disk. */ - if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, NOCRED, td) != 0) + if (VOP_IOCTL(devvp, DIOCGSECTORSIZE, (caddr_t)§orsize, + FREAD, NOCRED, td) != 0) size = DEV_BSIZE; else - size = dpart.disklab->d_secsize; + size = sectorsize; if ((error = bread(devvp, (ufs_daddr_t)(SBOFF/size), SBSIZE, NOCRED,&bp)) != 0) return (error); newfs = (struct fs *)bp->b_data; @@ -545,7 +546,6 @@ ffs_mountfs(devvp, mp, td, malloctype) struct buf *bp; register struct fs *fs; dev_t dev; - struct partinfo dpart; void *space; int error, i, blks, size, ronly; int32_t *lp; @@ -553,6 +553,7 @@ ffs_mountfs(devvp, mp, td, malloctype) u_int64_t maxfilesize; /* XXX */ size_t strsize; int ncount; + u_int sectorsize; dev = devvp->v_rdev; cred = td ? td->td_ucred : NOCRED; @@ -608,10 +609,11 @@ ffs_mountfs(devvp, mp, td, malloctype) if (mp->mnt_iosize_max > MAXPHYS) mp->mnt_iosize_max = MAXPHYS; - if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, cred, td) != 0) + if (VOP_IOCTL(devvp, DIOCGSECTORSIZE, (caddr_t)§orsize, + FREAD, cred, td) != 0) size = DEV_BSIZE; else - size = dpart.disklab->d_secsize; + size = sectorsize; bp = NULL; ump = NULL; |