From c836b2737b6d2c6311063c57dd804a39ba0f4b4d Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Mon, 11 Mar 2002 10:11:00 +0000 Subject: Remove use of the bogus ioctl DIOCGPART. It was used to initialize an unused variable, because ext2fs was copy&pasted from UFS rather than copy,paste&cleaned from UFS. Suggested by: bde --- sys/gnu/ext2fs/ext2_vfsops.c | 12 +----------- sys/gnu/fs/ext2fs/ext2_vfsops.c | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) (limited to 'sys/gnu') diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index e08b2f2281745..15a94d998182a 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -627,9 +626,7 @@ ext2_mountfs(devvp, mp, td) register struct ext2_sb_info *fs; struct ext2_super_block * es; dev_t dev = devvp->v_rdev; - struct partinfo dpart; - int havepart = 0; - int error, i, size; + int error, i; int ronly; /* @@ -655,13 +652,6 @@ ext2_mountfs(devvp, mp, td) VOP_UNLOCK(devvp, 0, td); if (error) return (error); - if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, NOCRED, td) != 0) - size = DEV_BSIZE; - else { - havepart = 1; - size = dpart.disklab->d_secsize; - } - bp = NULL; ump = NULL; if ((error = bread(devvp, SBLOCK, SBSIZE, NOCRED, &bp)) != 0) diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index e08b2f2281745..15a94d998182a 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -627,9 +626,7 @@ ext2_mountfs(devvp, mp, td) register struct ext2_sb_info *fs; struct ext2_super_block * es; dev_t dev = devvp->v_rdev; - struct partinfo dpart; - int havepart = 0; - int error, i, size; + int error, i; int ronly; /* @@ -655,13 +652,6 @@ ext2_mountfs(devvp, mp, td) VOP_UNLOCK(devvp, 0, td); if (error) return (error); - if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, NOCRED, td) != 0) - size = DEV_BSIZE; - else { - havepart = 1; - size = dpart.disklab->d_secsize; - } - bp = NULL; ump = NULL; if ((error = bread(devvp, SBLOCK, SBSIZE, NOCRED, &bp)) != 0) -- cgit v1.3