From owner-svn-src-all@freebsd.org Thu Aug 20 05:18:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2101C3AFE42; Thu, 20 Aug 2020 05:18:09 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BXCbP02x8z3bLr; Thu, 20 Aug 2020 05:18:09 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D93EBF3C6; Thu, 20 Aug 2020 05:18:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07K5I88K063448; Thu, 20 Aug 2020 05:18:08 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07K5I8vA063447; Thu, 20 Aug 2020 05:18:08 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <202008200518.07K5I8vA063447@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 20 Aug 2020 05:18:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364417 - head/usr.sbin/fstyp X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: head/usr.sbin/fstyp X-SVN-Commit-Revision: 364417 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2020 05:18:09 -0000 Author: pfg Date: Thu Aug 20 05:18:08 2020 New Revision: 364417 URL: https://svnweb.freebsd.org/changeset/base/364417 Log: usr.sbin/fstyp: Fix incorrect pfs_type test in ondisk inode "ipdata.meta.pfs_type & HAMMER2_PFSTYPE_SUPROOT" happened to have the same result (except HAMMER2_PFSTYPE_DUMMY could also match). Obtained from: Dragonfly (git 29e6489bbd4f8e237c9c17b300ac8b711f36770) Modified: head/usr.sbin/fstyp/hammer2.c Modified: head/usr.sbin/fstyp/hammer2.c ============================================================================== --- head/usr.sbin/fstyp/hammer2.c Thu Aug 20 05:08:49 2020 (r364416) +++ head/usr.sbin/fstyp/hammer2.c Thu Aug 20 05:18:08 2020 (r364417) @@ -127,7 +127,7 @@ find_pfs(FILE *fp, const hammer2_blockref_t *bref, con switch (bref->type) { case HAMMER2_BREF_TYPE_INODE: ipdata = media->ipdata; - if (ipdata.meta.pfs_type & HAMMER2_PFSTYPE_SUPROOT) { + if (ipdata.meta.pfs_type == HAMMER2_PFSTYPE_SUPROOT) { bscan = &ipdata.u.blockset.blockref[0]; bcount = HAMMER2_SET_COUNT; } else {