Module Name: src
Committed By: mlelstv
Date: Thu Feb 11 00:06:16 UTC 2010
Modified Files:
src/sys/ufs/ffs: ffs_vfsops.c
Log Message:
There is no code left that uses disk size data, so don't query it.
This also failed when querying the simulated block device from mfs.
Fixes PR kern/42782.
To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/sys/ufs/ffs/ffs_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/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.257 src/sys/ufs/ffs/ffs_vfsops.c:1.258
--- src/sys/ufs/ffs/ffs_vfsops.c:1.257 Fri Feb 5 20:03:36 2010
+++ src/sys/ufs/ffs/ffs_vfsops.c Thu Feb 11 00:06:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.257 2010/02/05 20:03:36 mlelstv Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.258 2010/02/11 00:06:16 mlelstv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.257 2010/02/05 20:03:36 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.258 2010/02/11 00:06:16 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -822,8 +822,6 @@
daddr_t sblockloc, fsblockloc;
int blks, fstype;
int error, i, bsize, ronly, bset = 0;
- uint64_t numsecs;
- unsigned secsize;
#ifdef FFS_EI
int needswap = 0; /* keep gcc happy */
#endif
@@ -842,9 +840,6 @@
return (error);
ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
- error = getdisksize(devvp, &numsecs, &secsize);
- if (error)
- return (error);
bp = NULL;
ump = NULL;
