From 30b14d35565fe36e8154b15545954496b0717e98 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Wed, 26 Jan 2011 11:51:01 +0100
Subject: [PATCH] ext2fs: Remove some unused variables.

---
 sys/vfs/gnu/ext2fs/ext2_bmap.c      | 2 --
 sys/vfs/gnu/ext2fs/ext2_readwrite.c | 2 --
 sys/vfs/gnu/ext2fs/ext2_vfsops.c    | 9 ++-------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/sys/vfs/gnu/ext2fs/ext2_bmap.c b/sys/vfs/gnu/ext2fs/ext2_bmap.c
index aef2608c9f..cb98a75475 100644
--- a/sys/vfs/gnu/ext2fs/ext2_bmap.c
+++ b/sys/vfs/gnu/ext2fs/ext2_bmap.c
@@ -128,7 +128,6 @@ ext2_bmaparray(struct vnode *vp, ext2_daddr_t bn, ext2_daddr_t *bnp,
 	struct buf *bp;
 	struct ext2mount *ump;
 	struct mount *mp;
-	struct vnode *devvp;
 	struct ext2_sb_info *fs;
 	struct indir a[NIADDR+1], *xap;
 	ext2_daddr_t daddr;
@@ -138,7 +137,6 @@ ext2_bmaparray(struct vnode *vp, ext2_daddr_t bn, ext2_daddr_t *bnp,
 	ip = VTOI(vp);
 	mp = vp->v_mount;
 	ump = VFSTOEXT2(mp);
-	devvp = ump->um_devvp;
 	fs = ip->i_e2fs;
 #ifdef DIAGNOSTIC
 	if ((ap != NULL && nump == NULL) || (ap == NULL && nump != NULL))
diff --git a/sys/vfs/gnu/ext2fs/ext2_readwrite.c b/sys/vfs/gnu/ext2fs/ext2_readwrite.c
index d31754d80d..65468fcf60 100644
--- a/sys/vfs/gnu/ext2fs/ext2_readwrite.c
+++ b/sys/vfs/gnu/ext2fs/ext2_readwrite.c
@@ -66,11 +66,9 @@ ext2_read(struct vop_read_args *ap)
 	long size, xfersize, blkoffset;
 	int error, orig_resid;
 	int seqcount = ap->a_ioflag >> 16;
-	u_short mode;
 
 	vp = ap->a_vp;
 	ip = VTOI(vp);
-	mode = ip->i_mode;
 	uio = ap->a_uio;
 
 #ifdef DIAGNOSTIC
diff --git a/sys/vfs/gnu/ext2fs/ext2_vfsops.c b/sys/vfs/gnu/ext2fs/ext2_vfsops.c
index 6cdd777eff..c3b30dcace 100644
--- a/sys/vfs/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/vfs/gnu/ext2fs/ext2_vfsops.c
@@ -748,7 +748,7 @@ ext2_mountfs(struct vnode *devvp, struct mount *mp, struct ucred *cred)
 	struct ext2_super_block * es;
 	cdev_t dev;
 	struct partinfo dpart;
-	int error, i, size;
+	int error, i;
 	int ronly;
 
 	/*
@@ -779,12 +779,7 @@ ext2_mountfs(struct vnode *devvp, struct mount *mp, struct ucred *cred)
 		mp->mnt_iosize_max = dev->si_iosize_max;
 	if (mp->mnt_iosize_max > MAXPHYS)
 		mp->mnt_iosize_max = MAXPHYS;
-	if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD,
-		      cred, NULL) != 0) {
-		size = DEV_BSIZE;
-	} else {
-		size = dpart.media_blksize;
-	}
+	VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, cred, NULL);
 
 	bp = NULL;
 	ump = NULL;
-- 
2.41.0