From: Sascha Wildner <saw@online.de>
Date: Fri, 25 Oct 2013 14:58:15 +0000 (+0200)
Subject: kernel: Some cleanup in ext2fs and linux emulation after recent work.
X-Git-Tag: v3.7.0~65
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/5c7e3225928e814857a168e9d9659c55c499b9b5

kernel: Some cleanup in ext2fs and linux emulation after recent work.
---

diff --git a/sys/emulation/linux/linux_misc.c b/sys/emulation/linux/linux_misc.c
index 7fcc497091..c1dac7d7e7 100644
--- a/sys/emulation/linux/linux_misc.c
+++ b/sys/emulation/linux/linux_misc.c
@@ -127,7 +127,6 @@ int
 sys_linux_sysinfo(struct linux_sysinfo_args *args)
 {
 	struct l_sysinfo sysinfo;
-	vm_object_t object;
 	struct timespec ts;
 	int error;
 	int i;
diff --git a/sys/gnu/vfs/ext2fs/ext2_vfsops.c b/sys/gnu/vfs/ext2fs/ext2_vfsops.c
index 47618b3464..07feedec24 100644
--- a/sys/gnu/vfs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/vfs/ext2fs/ext2_vfsops.c
@@ -630,8 +630,7 @@ compute_sb_data(struct vnode *devvp, struct ext2_super_block *es,
  *	5) invalidate all cached file data.
  *	6) re-read inode data for all active vnodes.
  */
-static int ext2_reload_scan1(struct mount *mp, struct vnode *vp, void *rescan);
-static int ext2_reload_scan2(struct mount *mp, struct vnode *vp, void *rescan);
+static int ext2_reload_scan(struct mount *mp, struct vnode *vp, void *rescan);
 
 struct scaninfo {
 	int rescan;
@@ -689,21 +688,13 @@ ext2_reload(struct mount *mountp, struct ucred *cred)
 	while (error == 0 && scaninfo.rescan) {
 	    scaninfo.rescan = 0;
 	    error = vmntvnodescan(mountp, VMSC_GETVX,
-				  NULL, ext2_reload_scan2, &scaninfo);
+				  NULL, ext2_reload_scan, &scaninfo);
 	}
 	return(error);
 }
 
 static int
-ext2_reload_scan1(struct mount *mp, struct vnode *vp, void *data)
-{
-	/*struct scaninfo *info = data;*/
-
-	return(0);
-}
-
-static int
-ext2_reload_scan2(struct mount *mp, struct vnode *vp, void *data)
+ext2_reload_scan(struct mount *mp, struct vnode *vp, void *data)
 {
 	struct scaninfo *info = data;
 	struct inode *ip;