Module Name: src Committed By: tkusumi Date: Wed Jan 15 15:32:05 UTC 2020
Modified Files: src/usr.sbin/fstyp: hammer2.c Log Message: fstyp: Remove redundant best_i check in HAMMER2 https://reviews.freebsd.org/D23159 taken-from: DragonFlyBSD originally from FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/fstyp/hammer2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/fstyp/hammer2.c diff -u src/usr.sbin/fstyp/hammer2.c:1.3 src/usr.sbin/fstyp/hammer2.c:1.4 --- src/usr.sbin/fstyp/hammer2.c:1.3 Sat Jan 4 03:43:18 2020 +++ src/usr.sbin/fstyp/hammer2.c Wed Jan 15 15:32:05 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: hammer2.c,v 1.3 2020/01/04 03:43:18 tkusumi Exp $ */ +/* $NetBSD: hammer2.c,v 1.4 2020/01/15 15:32:05 tkusumi Exp $ */ /*- * Copyright (c) 2017-2019 The DragonFly Project @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hammer2.c,v 1.3 2020/01/04 03:43:18 tkusumi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hammer2.c,v 1.4 2020/01/15 15:32:05 tkusumi Exp $"); #include <stdio.h> #include <stdlib.h> @@ -225,10 +225,6 @@ read_label(FILE *fp, char *label, size_t best = broot; } } - if (best_i == -1) { - warnx("failed to find best zone"); - goto fail; - } bref = &vols[best_i]->voldata.sroot_blockset.blockref[0]; if (bref->type != HAMMER2_BREF_TYPE_INODE) {