Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/ufs/ffs Make DEBUG_FFS_MOUNT compile again (with 64-bit ...



details:   https://anonhg.NetBSD.org/src/rev/21a58878d2b4
branches:  trunk
changeset: 376221:21a58878d2b4
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Jun 05 04:59:46 2023 +0000

description:
Make DEBUG_FFS_MOUNT compile again (with 64-bit ino_t).

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 8bab06481437 -r 21a58878d2b4 sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Mon Jun 05 03:51:45 2023 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Mon Jun 05 04:59:46 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vfsops.c,v 1.379 2022/12/21 18:58:25 chs Exp $     */
+/*     $NetBSD: ffs_vfsops.c,v 1.380 2023/06/05 04:59:46 rin Exp $     */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.379 2022/12/21 18:58:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.380 2023/06/05 04:59:46 rin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -195,7 +195,7 @@ ffs_checkrange(struct mount *mp, ino_t i
        struct fs *fs = VFSTOUFS(mp)->um_fs;
 
        if (ino < UFS_ROOTINO || ino >= fs->fs_ncg * fs->fs_ipg) {
-               DPRINTF("out of range %u\n", ino);
+               DPRINTF("out of range %" PRIu64 "\n", ino);
                return ESTALE;
        }
 
@@ -213,7 +213,8 @@ ffs_checkrange(struct mount *mp, ino_t i
        int error = bread(ump->um_devvp, FFS_FSBTODB(fs, cgtod(fs, cg)),
            (int)fs->fs_cgsize, B_MODIFY, &bp);
        if (error) {
-               DPRINTF("error %d reading cg %d ino %u\n", error, cg, ino);
+               DPRINTF("error %d reading cg %d ino %" PRIu64 "\n",
+                   error, cg, ino);
                return error;
        }
 
@@ -222,7 +223,8 @@ ffs_checkrange(struct mount *mp, ino_t i
        struct cg *cgp = (struct cg *)bp->b_data;
        if (!cg_chkmagic(cgp, needswap)) {
                brelse(bp, 0);
-               DPRINTF("bad cylinder group magic cg %d ino %u\n", cg, ino);
+               DPRINTF("bad cylinder group magic cg %d ino %" PRIu64 "\n",
+                   cg, ino);
                return ESTALE;
        }
 
@@ -230,7 +232,7 @@ ffs_checkrange(struct mount *mp, ino_t i
        brelse(bp, 0);
 
        if (cg * fs->fs_ipg + initediblk < ino) {
-               DPRINTF("cg=%d fs->fs_ipg=%d initediblk=%d ino=%u\n",
+               DPRINTF("cg=%d fs->fs_ipg=%d initediblk=%d ino=%" PRIu64 "\n",
                    cg, fs->fs_ipg, initediblk, ino);
                return ESTALE;
        }



Home | Main Index | Thread Index | Old Index