Date: Wed, 21 Dec 2022 02:31:42 GMT From: Kirk McKusick <mckusick@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 52011f5f9273 - main - Format cleanups. Message-ID: <202212210231.2BL2VgYs089617@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=52011f5f92739f682011bd97876296c0195e8645 commit 52011f5f92739f682011bd97876296c0195e8645 Author: Kirk McKusick <mckusick@FreeBSD.org> AuthorDate: 2022-12-21 02:30:36 +0000 Commit: Kirk McKusick <mckusick@FreeBSD.org> 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); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212210231.2BL2VgYs089617>