Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/ufs/ffs There is no code left that uses disk size data, ...



details:   https://anonhg.NetBSD.org/src/rev/a23e5c53ede6
branches:  trunk
changeset: 752001:a23e5c53ede6
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Thu Feb 11 00:06:16 2010 +0000

description:
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.

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r 6082895296e1 -r a23e5c53ede6 sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Wed Feb 10 23:33:56 2010 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Thu Feb 11 00:06:16 2010 +0000
@@ -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;



Home | Main Index | Thread Index | Old Index