[src/trunk]: src/sbin/fsck abort earlier.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c275d6904fe
branches:  trunk
changeset: 335188:8c275d6904fe
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Dec 29 16:35:38 2014 +0000

description:
abort earlier.

diffstat:

 sbin/fsck/partutil.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 9ac8ac0031e5 -r 8c275d6904fe sbin/fsck/partutil.c
--- a/sbin/fsck/partutil.c      Mon Dec 29 16:27:43 2014 +0000
+++ b/sbin/fsck/partutil.c      Mon Dec 29 16:35:38 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: partutil.c,v 1.13 2014/12/29 16:27:43 christos Exp $   */
+/*     $NetBSD: partutil.c,v 1.14 2014/12/29 16:35:38 christos Exp $   */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: partutil.c,v 1.13 2014/12/29 16:27:43 christos Exp $");
+__RCSID("$NetBSD: partutil.c,v 1.14 2014/12/29 16:35:38 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -125,6 +125,9 @@
                dict2geom(geo, geom_dict);
        }
 
+       if (dkw == NULL)
+               return 0;
+
        /* Get info about partition/wedge */
        if (ioctl(fd, DIOCGWEDGEINFO, dkw) != -1) {
                /* DIOCGWEDGEINFO didn't fail, we're done */
@@ -136,9 +139,6 @@
                    "DIOCGDINFO for disk device %s", s);
        }
 
-       if (dkw == NULL)
-               return 0;
-
        /* DIOCGDINFO didn't fail */
        (void)memset(dkw, 0, sizeof(*dkw));