[src/trunk]: src/sys/kern Fix build with LOCKF_DEBUG on LP64 platforms; from ...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/821a882b3a6f
branches:  trunk
changeset: 761529:821a882b3a6f
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Jan 31 08:25:32 2011 +0000

description:
Fix build with LOCKF_DEBUG on LP64 platforms; from Alexander Nasonov
in PR 44490.

diffstat:

 sys/kern/vfs_lockf.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r 5727de33e2fe -r 821a882b3a6f sys/kern/vfs_lockf.c
--- a/sys/kern/vfs_lockf.c      Mon Jan 31 06:33:05 2011 +0000
+++ b/sys/kern/vfs_lockf.c      Mon Jan 31 08:25:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_lockf.c,v 1.72 2009/08/05 19:39:50 dsl Exp $       */
+/*     $NetBSD: vfs_lockf.c,v 1.73 2011/01/31 08:25:32 dholland Exp $  */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lockf.c,v 1.72 2009/08/05 19:39:50 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lockf.c,v 1.73 2011/01/31 08:25:32 dholland Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -138,11 +138,11 @@
                printf("proc %d", ((struct proc *)lock->lf_id)->p_pid);
        else
                printf("file %p", (struct file *)lock->lf_id);
-       printf(" %s, start %qx, end %qx",
+       printf(" %s, start %jd, end %jd",
                lock->lf_type == F_RDLCK ? "shared" :
                lock->lf_type == F_WRLCK ? "exclusive" :
                lock->lf_type == F_UNLCK ? "unlock" :
-               "unknown", lock->lf_start, lock->lf_end);
+               "unknown", (intmax_t)lock->lf_start, (intmax_t)lock->lf_end);
        if (TAILQ_FIRST(&lock->lf_blkhd))
                printf(" block %p\n", TAILQ_FIRST(&lock->lf_blkhd));
        else
@@ -161,22 +161,22 @@
                        printf("proc %d", ((struct proc *)lf->lf_id)->p_pid);
                else
                        printf("file %p", (struct file *)lf->lf_id);
-               printf(", %s, start %qx, end %qx",
+               printf(", %s, start %jd, end %jd",
                        lf->lf_type == F_RDLCK ? "shared" :
                        lf->lf_type == F_WRLCK ? "exclusive" :
                        lf->lf_type == F_UNLCK ? "unlock" :
-                       "unknown", lf->lf_start, lf->lf_end);
+                       "unknown", (intmax_t)lf->lf_start, (intmax_t)lf->lf_end);
                TAILQ_FOREACH(blk, &lf->lf_blkhd, lf_block) {
                        if (blk->lf_flags & F_POSIX)
                                printf("; proc %d",
                                    ((struct proc *)blk->lf_id)->p_pid);
                        else
                                printf("; file %p", (struct file *)blk->lf_id);
-                       printf(", %s, start %qx, end %qx",
+                       printf(", %s, start %jd, end %jd",
                                blk->lf_type == F_RDLCK ? "shared" :
                                blk->lf_type == F_WRLCK ? "exclusive" :
                                blk->lf_type == F_UNLCK ? "unlock" :
-                               "unknown", blk->lf_start, blk->lf_end);
+                               "unknown", (intmax_t)blk->lf_start, (intmax_t)blk->lf_end);
                        if (TAILQ_FIRST(&blk->lf_blkhd))
                                 panic("lf_printlist: bad list");
                }