Module Name: src
Committed By: mlelstv
Date: Thu Feb 11 19:50:34 UTC 2010
Modified Files:
src/sys/ufs/ext2fs: ext2fs_vfsops.c
Log Message:
There is no code left that uses disk size data, so don't query it.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/ufs/ext2fs/ext2fs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.155 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.156
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.155 Sun Jan 31 10:37:57 2010
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Thu Feb 11 19:50:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.155 2010/01/31 10:37:57 mlelstv Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.156 2010/02/11 19:50:34 mlelstv Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.155 2010/01/31 10:37:57 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.156 2010/02/11 19:50:34 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -522,8 +522,6 @@
struct m_ext2fs *fs;
struct ext2fs *newfs;
int i, error;
- uint64_t numsecs;
- unsigned secsize;
void *cp;
struct ufsmount *ump;
@@ -543,11 +541,6 @@
/*
* Step 2: re-read superblock from disk.
*/
- error = getdisksize(devvp, &numsecs, &secsize);
- if (error) {
- brelse(bp, 0);
- return (error);
- }
error = bread(devvp, SBLOCK, SBSIZE, NOCRED, 0, &bp);
if (error) {
brelse(bp, 0);
@@ -669,8 +662,6 @@
struct m_ext2fs *m_fs;
dev_t dev;
int error, i, ronly;
- uint64_t numsecs;
- unsigned secsize;
kauth_cred_t cred;
struct proc *p;
@@ -686,9 +677,6 @@
return (error);
ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
- error = getdisksize(devvp, &numsecs, &secsize);
- if (error)
- return (error);
bp = NULL;
ump = NULL;
