From nobody Wed Dec 21 02:31:42 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NcHWf3Hkwz1GJtJ; Wed, 21 Dec 2022 02:31:42 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NcHWf2nQfz44xJ; Wed, 21 Dec 2022 02:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671589902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E7B5zU+adc6MQKVhG5WsA8kRCaemqAkSLKNas2BTEuE=; b=oClOJG0EDKSDIT4PcykckHKCdY/m0+sLI3LrvQ+CaYnsCpix73bgwMCa1EVSZsg5vjX2GQ lwvuQ+lNBSDfI875xwjOwy/t+zkVcG6innfIY8ucj1L3FICpekZrb1FI8obu6LBZNUpFLY Vh4hdsKB65vuaxhdA9TQGP9M/fykds3XDA+vSYrT8u0NrUGseml+viNbyhdUoGmBrPyTBl y2SsbXjN2Bqdg8M2HQzUCQVAiygsdOooTMxto9uwLzW/Gf3qy2r9APTe499ANUYoku/zDW wcWUqIpznx4sZrOaKVjFOV/vazo7JcIAfMduMVM1cK68F5DVIs3zNqaIFZ2pGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671589902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E7B5zU+adc6MQKVhG5WsA8kRCaemqAkSLKNas2BTEuE=; b=nfER7Vol+w6r0b14O9eV5yNAvWHlwjWTKIeHewG3NSsAP/qlGqZten/eh1iw/2lww78sCh SkvvFEvyMM//N1WOlb82wHbFt1QRV8xY6pSwt0BCY4h+6uvnQlv8mJexaIxE+hGEN0FCYl nfmbTG2MNZAhca6DX0Rw84SpB0hv7G59dhrarP7xLBudbSGtR7yBRDigp2e7wniMFol0G5 Moos8NKsoktpqrEI22T3xmFi1KbT/zObxKlp0J9agc61HGYOhrl/JFoB5NYljuSnJXSSDm TmO5RoQ99EihZsTuNSQzSv/xs+OlY6JJ0cuFrmLe/SFV1JxYBjii6tRkYwD7wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671589902; a=rsa-sha256; cv=none; b=LDzhF1GMnLIT1igkCH6SvS8hqQCh/KTKIHBRubwJ/nEBVzIxHf+xXr1Mk8qs0sxbGAGXIr ZZdrEXQ/vSDLxftmRcc0ulD5ldGZaiEeJbVkVqVmF1CarTl5pg4V8e+9NhC8DGPHJCwvgT x+gz5LDyG9HpFENU6V8LInJyP6zKZWmmZC1zj1ysPNCUu3GjYDj0scv3qK4kDY4FLgwJBN 8M6enrqLIDXP5m1JNMmT7rr70emUZ9dMHnzaiRHNuYe6jmN+G5qru8VgZ9b77EqNdjn0YL dKHXservlxt5HPLEQbAuiwG0XZE7glH7AyqMqF1o3ieyyWDyigJniCAhucpbCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NcHWf1rjvzymG; Wed, 21 Dec 2022 02:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BL2Vglw089618; Wed, 21 Dec 2022 02:31:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BL2VgYs089617; Wed, 21 Dec 2022 02:31:42 GMT (envelope-from git) Date: Wed, 21 Dec 2022 02:31:42 GMT Message-Id: <202212210231.2BL2VgYs089617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 52011f5f9273 - main - Format cleanups. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52011f5f92739f682011bd97876296c0195e8645 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=52011f5f92739f682011bd97876296c0195e8645 commit 52011f5f92739f682011bd97876296c0195e8645 Author: Kirk McKusick AuthorDate: 2022-12-21 02:30:36 +0000 Commit: Kirk McKusick CommitDate: 2022-12-21 02:30:36 +0000 Format cleanups. No functional change intended. Differential Revision: https://reviews.freebsd.org/D33424 --- sys/ufs/ffs/ffs_subr.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 31f30ba5d175..0b462add0d05 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -385,15 +385,15 @@ validate_sblock(struct fs *fs, int flags) warnerr = (flags & UFS_NOWARNFAIL) == UFS_NOWARNFAIL ? 0 : ENOENT; wmsg = warnerr ? "" : " (Ignored)"; /* - * Check for endian mismatch between machine and filesystem. - */ + * Check for endian mismatch between machine and filesystem. + */ if (((fs->fs_magic != FS_UFS2_MAGIC) && - (bswap32(fs->fs_magic) == FS_UFS2_MAGIC)) || - ((fs->fs_magic != FS_UFS1_MAGIC) && - (bswap32(fs->fs_magic) == FS_UFS1_MAGIC))) { - MPRINT("UFS superblock failed due to endian mismatch " - "between machine and filesystem\n"); - return(EILSEQ); + (bswap32(fs->fs_magic) == FS_UFS2_MAGIC)) || + ((fs->fs_magic != FS_UFS1_MAGIC) && + (bswap32(fs->fs_magic) == FS_UFS1_MAGIC))) { + MPRINT("UFS superblock failed due to endian mismatch " + "between machine and filesystem\n"); + return(EILSEQ); } /* * If just validating for recovery, then do just the minimal @@ -647,7 +647,7 @@ ffs_sbsearch(void *devfd, struct fs **fsp, int reqflags, if (error == 0 || error == EILSEQ) { if (msg && error == EILSEQ) printf("UFS superblock failed due to endian mismatch " - "between machine and filesystem\n"); + "between machine and filesystem\n"); return (error); } /*