Date: Sun, 05 Jun 2011 16:20:38 +0000 From: gk@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r222840 - in soc2011/gk/ino64-head/sys: compat/svr4 fs/cd9660 fs/ext2fs fs/hpfs fs/ntfs fs/tmpfs kern security/mac_lomac ufs/ffs ufs/ufs Message-ID: <20110605162038.71B32106566C@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gk Date: Sun Jun 5 16:20:38 2011 New Revision: 222840 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222840 Log: sys: Change ino_t printf format flag to %ju Modified: soc2011/gk/ino64-head/sys/compat/svr4/svr4_socket.c soc2011/gk/ino64-head/sys/fs/cd9660/cd9660_vnops.c soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_alloc.c soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_inode_cnv.c soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vfsops.c soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_subr.c soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vfsops.c soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c soc2011/gk/ino64-head/sys/fs/tmpfs/tmpfs_vfsops.c soc2011/gk/ino64-head/sys/kern/uipc_usrreq.c soc2011/gk/ino64-head/sys/security/mac_lomac/mac_lomac.c soc2011/gk/ino64-head/sys/ufs/ffs/ffs_alloc.c soc2011/gk/ino64-head/sys/ufs/ffs/ffs_snapshot.c soc2011/gk/ino64-head/sys/ufs/ffs/ffs_softdep.c soc2011/gk/ino64-head/sys/ufs/ufs/ufs_acl.c soc2011/gk/ino64-head/sys/ufs/ufs/ufs_lookup.c soc2011/gk/ino64-head/sys/ufs/ufs/ufs_vnops.c Modified: soc2011/gk/ino64-head/sys/compat/svr4/svr4_socket.c ============================================================================== --- soc2011/gk/ino64-head/sys/compat/svr4/svr4_socket.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/compat/svr4/svr4_socket.c Sun Jun 5 16:20:38 2011 (r222840) @@ -93,7 +93,7 @@ struct svr4_sockcache_entry *e; void *cookie = ((struct socket *)fp->f_data)->so_emuldata; - DPRINTF(("svr4_find_socket: [%p,%d,%d]: ", td, dev, ino)); + DPRINTF(("svr4_find_socket: [%p,%d,%ju]: ", td, dev, (uintmax_t)ino)); mtx_lock(&svr4_sockcache_lock); TAILQ_FOREACH(e, &svr4_head, entries) if (e->p == td->td_proc && e->dev == dev && e->ino == ino) { @@ -142,8 +142,8 @@ mtx_lock(&svr4_sockcache_lock); TAILQ_INSERT_HEAD(&svr4_head, e, entries); mtx_unlock(&svr4_sockcache_lock); - DPRINTF(("svr4_add_socket: %s [%p,%d,%d]\n", e->sock.sun_path, - td->td_proc, e->dev, e->ino)); + DPRINTF(("svr4_add_socket: %s [%p,%d,%ju]\n", e->sock.sun_path, + td->td_proc, e->dev, (uintmax_t)e->ino)); return 0; } @@ -160,8 +160,9 @@ if (e->p == p && e->cookie == cookie) { TAILQ_REMOVE(&svr4_head, e, entries); mtx_unlock(&svr4_sockcache_lock); - DPRINTF(("svr4_delete_socket: %s [%p,%d,%d]\n", - e->sock.sun_path, p, (int)e->dev, e->ino)); + DPRINTF(("svr4_delete_socket: %s [%p,%d,%ju]\n", + e->sock.sun_path, p, (int)e->dev, + (uintmax_t)e->ino)); free(e, M_TEMP); return; } @@ -179,8 +180,9 @@ TAILQ_FOREACH_SAFE(e, &svr4_head, entries, ne) { if (e->p == p) { TAILQ_REMOVE(&svr4_head, e, entries); - DPRINTF(("svr4_purge_sockcache: %s [%p,%d,%d]\n", - e->sock.sun_path, p, (int)e->dev, e->ino)); + DPRINTF(("svr4_purge_sockcache: %s [%p,%d,%ju]\n", + e->sock.sun_path, p, (int)e->dev, + (uintmax_t)e->ino)); free(e, M_TEMP); } } Modified: soc2011/gk/ino64-head/sys/fs/cd9660/cd9660_vnops.c ============================================================================== --- soc2011/gk/ino64-head/sys/fs/cd9660/cd9660_vnops.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/fs/cd9660/cd9660_vnops.c Sun Jun 5 16:20:38 2011 (r222840) @@ -475,6 +475,7 @@ struct iso_mnt *imp; struct buf *bp = NULL; struct iso_directory_record *ep; + ino_t rripino; int entryoffsetinblock; doff_t endsearch; u_long bmask; @@ -579,7 +580,8 @@ switch (imp->iso_ftype) { case ISO_FTYPE_RRIP: cd9660_rrip_getname(ep,idp->current.d_name, &namelen, - &idp->current.d_fileno,imp); + &rripino, imp); + idp->current.d_fileno = rripino; idp->current.d_namlen = (u_char)namelen; if (idp->current.d_namlen) error = iso_uiodir(idp,&idp->current,idp->curroff); Modified: soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_alloc.c ============================================================================== --- soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_alloc.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_alloc.c Sun Jun 5 16:20:38 2011 (r222840) @@ -906,8 +906,8 @@ fs = pip->i_e2fs; ump = pip->i_ump; if ((u_int)ino > fs->e2fs_ipg * fs->e2fs_gcount) - panic("ext2_vfree: range: devvp = %p, ino = %d, fs = %s", - pip->i_devvp, ino, fs->e2fs_fsmnt); + panic("ext2_vfree: range: devvp = %p, ino = %ju, fs = %s", + pip->i_devvp, (uintmax_t)ino, fs->e2fs_fsmnt); cg = ino_to_cg(fs, ino); error = bread(pip->i_devvp, Modified: soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_inode_cnv.c ============================================================================== --- soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_inode_cnv.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_inode_cnv.c Sun Jun 5 16:20:38 2011 (r222840) @@ -42,7 +42,7 @@ { int i; - printf( "Inode: %5d", in->i_number); + printf( "Inode: %5ju", (uintmax_t)in->i_number); printf( /* "Inode: %5d" */ " Type: %10s Mode: 0x%o Flags: 0x%x Version: %d\n", "n/a", in->i_mode, in->i_flags, in->i_gen); Modified: soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vfsops.c ============================================================================== --- soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vfsops.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vfsops.c Sun Jun 5 16:20:38 2011 (r222840) @@ -511,7 +511,7 @@ error = bread(hpmp->hpm_devvp, ino, FNODESIZE, NOCRED, &bp); if (error) { - printf("hpfs_vget: can't read ino %d\n",ino); + printf("hpfs_vget: can't read ino %ju\n", (uintmax_t)ino); vput(vp); return (error); } Modified: soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_subr.c ============================================================================== --- soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_subr.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_subr.c Sun Jun 5 16:20:38 2011 (r222840) @@ -82,8 +82,8 @@ ntfs_ntvattrrele(vap) struct ntvattr * vap; { - dprintf(("ntfs_ntvattrrele: ino: %d, type: 0x%x\n", - vap->va_ip->i_number, vap->va_type)); + dprintf(("ntfs_ntvattrrele: ino: %ju, type: 0x%x\n", + (uintmax_t)vap->va_ip->i_number, vap->va_type)); ntfs_ntrele(vap->va_ip); @@ -107,12 +107,12 @@ struct ntvattr *vap; if((ip->i_flag & IN_LOADED) == 0) { - dprintf(("ntfs_findvattr: node not loaded, ino: %d\n", - ip->i_number)); + dprintf(("ntfs_findvattr: node not loaded, ino: %ju\n", + (uintmax_t)ip->i_number)); error = ntfs_loadntnode(ntmp,ip); if (error) { - printf("ntfs_findvattr: FAILED TO LOAD INO: %d\n", - ip->i_number); + printf("ntfs_findvattr: FAILED TO LOAD INO: %ju\n", + (uintmax_t)ip->i_number); return (error); } } @@ -167,13 +167,13 @@ if (name) { dprintf(("ntfs_ntvattrget: " \ - "ino: %d, type: 0x%x, name: %s, vcn: %d\n", \ - ip->i_number, type, name, (u_int32_t) vcn)); + "ino: %ju, type: 0x%x, name: %s, vcn: %d\n", \ + (uintmax_t)ip->i_number, type, name, (u_int32_t) vcn)); namelen = strlen(name); } else { dprintf(("ntfs_ntvattrget: " \ - "ino: %d, type: 0x%x, vcn: %d\n", \ - ip->i_number, type, (u_int32_t) vcn)); + "ino: %ju, type: 0x%x, vcn: %d\n", \ + (uintmax_t)ip->i_number, type, (u_int32_t) vcn)); name = ""; namelen = 0; } @@ -184,8 +184,8 @@ if (!lvap) { dprintf(("ntfs_ntvattrget: UNEXISTED ATTRIBUTE: " \ - "ino: %d, type: 0x%x, name: %s, vcn: %d\n", \ - ip->i_number, type, name, (u_int32_t) vcn)); + "ino: %ju, type: 0x%x, name: %s, vcn: %d\n", \ + (uintmax_t)ip->i_number, type, name, (u_int32_t) vcn)); return (ENOENT); } /* Scan $ATTRIBUTE_LIST for requested attribute */ @@ -243,8 +243,9 @@ error = ENOENT; dprintf(("ntfs_ntvattrget: UNEXISTED ATTRIBUTE: " \ - "ino: %d, type: 0x%x, name: %.*s, vcn: %d\n", \ - ip->i_number, type, (int) namelen, name, (u_int32_t) vcn)); + "ino: %ju, type: 0x%x, name: %.*s, vcn: %d\n", \ + (uintmax_t)ip->i_number, type, (int) namelen, name, + (u_int32_t) vcn)); out: free(alpool, M_TEMP); return (error); @@ -266,7 +267,8 @@ struct attr *ap; struct ntvattr *nvap; - dprintf(("ntfs_loadntnode: loading ino: %d\n",ip->i_number)); + dprintf(("ntfs_loadntnode: loading ino: %ju\n", + (uintmax_t)ip->i_number)); mfrp = malloc(ntfs_bntob(ntmp->ntm_bpmftrec), M_TEMP, M_WAITOK); @@ -307,12 +309,13 @@ error = ntfs_procfixups(ntmp, NTFS_FILEMAGIC, (caddr_t)mfrp, ntfs_bntob(ntmp->ntm_bpmftrec)); if (error) { - printf("ntfs_loadntnode: BAD MFT RECORD %d\n", - (u_int32_t) ip->i_number); + printf("ntfs_loadntnode: BAD MFT RECORD %ju\n", + (uintmax_t)ip->i_number); goto out; } - dprintf(("ntfs_loadntnode: load attrs for ino: %d\n",ip->i_number)); + dprintf(("ntfs_loadntnode: load attrs for ino: %ju\n", + (uintmax_t)ip->i_number)); off = mfrp->fr_attroff; ap = (struct attr *) ((caddr_t)mfrp + off); @@ -330,8 +333,8 @@ ap = (struct attr *) ((caddr_t)mfrp + off); } if (error) { - printf("ntfs_loadntnode: failed to load attr ino: %d\n", - ip->i_number); + printf("ntfs_loadntnode: failed to load attr ino: %ju\n", + (uintmax_t)ip->i_number); goto out; } @@ -354,8 +357,8 @@ ntfs_ntget(ip) struct ntnode *ip; { - dprintf(("ntfs_ntget: get ntnode %d: %p, usecount: %d\n", - ip->i_number, ip, ip->i_usecount)); + dprintf(("ntfs_ntget: get ntnode %ju: %p, usecount: %d\n", + (uintmax_t)ip->i_number, ip, ip->i_usecount)); mtx_lock(&ip->i_interlock); ip->i_usecount++; @@ -379,14 +382,14 @@ { struct ntnode *ip; - dprintf(("ntfs_ntlookup: looking for ntnode %d\n", ino)); + dprintf(("ntfs_ntlookup: looking for ntnode %ju\n", (uintmax_t)ino)); do { ip = ntfs_nthashlookup(ntmp->ntm_devvp->v_rdev, ino); if (ip != NULL) { ntfs_ntget(ip); - dprintf(("ntfs_ntlookup: ntnode %d: %p, usecount: %d\n", - ino, ip, ip->i_usecount)); + dprintf(("ntfs_ntlookup: ntnode %ju: %p, usecount: %d\n", + (uintmax_t)ino, ip, ip->i_usecount)); *ipp = ip; return (0); } @@ -394,7 +397,8 @@ ip = malloc(sizeof(struct ntnode), M_NTFSNTNODE, M_WAITOK | M_ZERO); - ddprintf(("ntfs_ntlookup: allocating ntnode: %d: %p\n", ino, ip)); + ddprintf(("ntfs_ntlookup: allocating ntnode: %ju: %p\n", + (uintmax_t)ino, ip)); /* Generic initialization */ ip->i_devvp = ntmp->ntm_devvp; @@ -416,8 +420,8 @@ *ipp = ip; - dprintf(("ntfs_ntlookup: ntnode %d: %p, usecount: %d\n", - ino, ip, ip->i_usecount)); + dprintf(("ntfs_ntlookup: ntnode %ju: %p, usecount: %d\n", + (uintmax_t)ino, ip, ip->i_usecount)); return (0); } @@ -434,16 +438,16 @@ { struct ntvattr *vap; - dprintf(("ntfs_ntput: rele ntnode %d: %p, usecount: %d\n", - ip->i_number, ip, ip->i_usecount)); + dprintf(("ntfs_ntput: rele ntnode %ju: %p, usecount: %d\n", + (uintmax_t)ip->i_number, ip, ip->i_usecount)); mtx_lock(&ip->i_interlock); ip->i_usecount--; #ifdef DIAGNOSTIC if (ip->i_usecount < 0) { - panic("ntfs_ntput: ino: %d usecount: %d \n", - ip->i_number,ip->i_usecount); + panic("ntfs_ntput: ino: %ju usecount: %d \n", + (uintmax_t)ip->i_number, ip->i_usecount); } #endif @@ -452,7 +456,8 @@ return; } - dprintf(("ntfs_ntput: deallocating ntnode: %d\n", ip->i_number)); + dprintf(("ntfs_ntput: deallocating ntnode: %ju\n", + (uintmax_t)ip->i_number)); if (LIST_FIRST(&ip->i_fnlist)) panic("ntfs_ntput: ntnode has fnodes\n"); @@ -481,8 +486,8 @@ ip->i_usecount++; mtx_unlock(&ip->i_interlock); - dprintf(("ntfs_ntref: ino %d, usecount: %d\n", - ip->i_number, ip->i_usecount)); + dprintf(("ntfs_ntref: ino %ju, usecount: %d\n", + (uintmax_t)ip->i_number, ip->i_usecount)); } @@ -493,15 +498,15 @@ ntfs_ntrele(ip) struct ntnode *ip; { - dprintf(("ntfs_ntrele: rele ntnode %d: %p, usecount: %d\n", - ip->i_number, ip, ip->i_usecount)); + dprintf(("ntfs_ntrele: rele ntnode %ju: %p, usecount: %d\n", + (uintmax_t)ip->i_number, ip, ip->i_usecount)); mtx_lock(&ip->i_interlock); ip->i_usecount--; if (ip->i_usecount < 0) - panic("ntfs_ntrele: ino: %d usecount: %d \n", - ip->i_number,ip->i_usecount); + panic("ntfs_ntrele: ino: %ju usecount: %d\n", + (uintmax_t)ip->i_number,ip->i_usecount); mtx_unlock(&ip->i_interlock); } @@ -751,8 +756,8 @@ { struct fnode *fp; - dprintf(("ntfs_fget: ino: %d, attrtype: 0x%x, attrname: %s\n", - ip->i_number,attrtype, attrname?attrname:"")); + dprintf(("ntfs_fget: ino: %ju, attrtype: 0x%x, attrname: %s\n", + (uintmax_t)ip->i_number,attrtype, attrname?attrname:"")); *fpp = NULL; LIST_FOREACH(fp, &ip->i_fnlist, f_fnlist){ dprintf(("ntfs_fget: fnode: attrtype: %d, attrname: %s\n", @@ -803,7 +808,8 @@ { struct ntnode *ip = FTONT(fp); - dprintf(("ntfs_frele: fnode: %p for %d: %p\n", fp, ip->i_number, ip)); + dprintf(("ntfs_frele: fnode: %p for %ju: %p\n", + fp, (uintmax_t)ip->i_number, ip)); dprintf(("ntfs_frele: deallocating fnode\n")); LIST_REMOVE(fp,f_fnlist); @@ -1133,7 +1139,8 @@ int error = ENOENT; u_int32_t aoff, cnum; - dprintf(("ntfs_ntreaddir: read ino: %d, num: %d\n", ip->i_number, num)); + dprintf(("ntfs_ntreaddir: read ino: %ju, num: %d\n", + (uintmax_t)ip->i_number, num)); error = ntfs_ntget(ip); if (error) return (error); @@ -1301,7 +1308,7 @@ struct ntvattr *vap; int error; - dprintf(("ntfs_times: ino: %d...\n", ip->i_number)); + dprintf(("ntfs_times: ino: %ju...\n", (uintmax_t)ip->i_number)); error = ntfs_ntget(ip); if (error) @@ -1336,7 +1343,7 @@ u_int64_t sz, bn; int error; - dprintf(("ntfs_filesize: ino: %d\n", ip->i_number)); + dprintf(("ntfs_filesize: ino: %ju\n", (uintmax_t)ip->i_number)); error = ntfs_ntvattrget(ntmp, ip, fp->f_attrtype, fp->f_attrname, 0, &vap); Modified: soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vfsops.c ============================================================================== --- soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vfsops.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vfsops.c Sun Jun 5 16:20:38 2011 (r222840) @@ -653,8 +653,8 @@ struct vnode *vp; enum vtype f_type; - dprintf(("ntfs_vgetex: ino: %d, attr: 0x%x:%s, lkf: 0x%lx, f: 0x%lx\n", - ino, attrtype, attrname?attrname:"", (u_long)lkflags, + dprintf(("ntfs_vgetex: ino: %ju, attr: 0x%x:%s, lkf: 0x%lx, f: 0x%lx\n", + (uintmax_t)ino, attrtype, attrname?attrname:"", (u_long)lkflags, (u_long)flags)); ntmp = VFSTONTFS(mp); @@ -671,8 +671,8 @@ if (!(flags & VG_DONTLOADIN) && !(ip->i_flag & IN_LOADED)) { error = ntfs_loadntnode(ntmp, ip); if(error) { - printf("ntfs_vget: CAN'T LOAD ATTRIBUTES FOR INO: %d\n", - ip->i_number); + printf("ntfs_vget: CAN'T LOAD ATTRIBUTES FOR INO: %ju\n", + (uintmax_t)ip->i_number); ntfs_ntput(ip); return (error); } @@ -727,7 +727,7 @@ ntfs_ntput(ip); return (error); } - dprintf(("ntfs_vget: vnode: %p for ntnode: %d\n", vp,ino)); + dprintf(("ntfs_vget: vnode: %p for ntnode: %ju\n", vp, (uintmax_t)ino)); fp->f_vp = vp; vp->v_data = fp; Modified: soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c ============================================================================== --- soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c Sun Jun 5 16:20:38 2011 (r222840) @@ -129,7 +129,9 @@ int resid, off, toread; int error; - dprintf(("ntfs_read: ino: %d, off: %d resid: %d, segflg: %d\n",ip->i_number,(u_int32_t)uio->uio_offset,uio->uio_resid,uio->uio_segflg)); + dprintf(("ntfs_read: ino: %ju, off: %jd resid: %zd, segflg: %d\n", + (uintmax_t)ip->i_number, (intmax_t)uio->uio_offset, + uio->uio_resid, uio->uio_segflg)); dprintf(("ntfs_read: filesize: %d",(u_int32_t)fp->f_size)); @@ -181,7 +183,8 @@ register struct ntnode *ip = FTONT(fp); register struct vattr *vap = ap->a_vap; - dprintf(("ntfs_getattr: %d, flags: %d\n",ip->i_number,ip->i_flag)); + dprintf(("ntfs_getattr: %ju, flags: %d\n", + (uintmax_t)ip->i_number, ip->i_flag)); vap->va_fsid = dev2udev(ip->i_dev); vap->va_fileid = ip->i_number; @@ -216,8 +219,8 @@ register struct ntnode *ip = VTONT(ap->a_vp); #endif - dprintf(("ntfs_inactive: vnode: %p, ntnode: %d\n", ap->a_vp, - ip->i_number)); + dprintf(("ntfs_inactive: vnode: %p, ntnode: %ju\n", + ap->a_vp, (uintmax_t)ip->i_number)); /* XXX since we don't support any filesystem changes * right now, nothing more needs to be done @@ -239,7 +242,8 @@ register struct ntnode *ip = FTONT(fp); int error; - dprintf(("ntfs_reclaim: vnode: %p, ntnode: %d\n", vp, ip->i_number)); + dprintf(("ntfs_reclaim: vnode: %p, ntnode: %ju\n", + vp, (uintmax_t)ip->i_number)); /* * Destroy the vm object and flush associated pages. @@ -352,7 +356,9 @@ size_t written; int error; - dprintf(("ntfs_write: ino: %d, off: %d resid: %d, segflg: %d\n",ip->i_number,(u_int32_t)uio->uio_offset,uio->uio_resid,uio->uio_segflg)); + dprintf(("ntfs_write: ino: %ju, off: %jd resid: %zd, segflg: %d\n", + (uintmax_t)ip->i_number, (intmax_t)uio->uio_offset, + uio->uio_resid, uio->uio_segflg)); dprintf(("ntfs_write: filesize: %d",(u_int32_t)fp->f_size)); if (uio->uio_resid + uio->uio_offset > fp->f_size) { @@ -387,7 +393,7 @@ struct ntnode *ip = VTONT(vp); accmode_t accmode = ap->a_accmode; - dprintf(("ntfs_access: %d\n",ip->i_number)); + dprintf(("ntfs_access: %ju\n", (uintmax_t)ip->i_number)); /* * Disallow write attempts on read-only filesystems; @@ -428,7 +434,7 @@ register struct vnode *vp = ap->a_vp; register struct ntnode *ip = VTONT(vp); - printf("ntfs_open: %d\n",ip->i_number); + printf("ntfs_open: %ju\n", (uintmax_t)ip->i_number); #endif vnode_create_vobject(ap->a_vp, VTOF(ap->a_vp)->f_size, ap->a_td); @@ -459,7 +465,7 @@ register struct vnode *vp = ap->a_vp; register struct ntnode *ip = VTONT(vp); - printf("ntfs_close: %d\n",ip->i_number); + printf("ntfs_close: %ju\n", (uintmax_t)ip->i_number); #endif return (0); @@ -487,7 +493,8 @@ struct dirent cde; off_t off; - dprintf(("ntfs_readdir %d off: %d resid: %d\n",ip->i_number,(u_int32_t)uio->uio_offset,uio->uio_resid)); + dprintf(("ntfs_readdir %ju off: %jd resid: %zd\n", + (uintmax_t)ip->i_number, (intmax_t)uio->uio_offset, uio->uio_resid)); off = uio->uio_offset; @@ -563,10 +570,10 @@ } } - dprintf(("ntfs_readdir: %d entries (%d bytes) read\n", - ncookies,(u_int)(uio->uio_offset - off))); - dprintf(("ntfs_readdir: off: %d resid: %d\n", - (u_int32_t)uio->uio_offset,uio->uio_resid)); + dprintf(("ntfs_readdir: %d entries (%jd bytes) read\n", + ncookies, (intmax_t)(uio->uio_offset - off))); + dprintf(("ntfs_readdir: off: %jd resid: %zd\n", + (intmax_t)uio->uio_offset, uio->uio_resid)); if (!error && ap->a_ncookies != NULL) { struct dirent* dpStart; @@ -612,9 +619,9 @@ struct componentname *cnp = ap->a_cnp; struct ucred *cred = cnp->cn_cred; int error; - dprintf(("ntfs_lookup: \"%.*s\" (%ld bytes) in %d\n", + dprintf(("ntfs_lookup: \"%.*s\" (%ld bytes) in %ju\n", (int)cnp->cn_namelen, cnp->cn_nameptr, cnp->cn_namelen, - dip->i_number)); + (uintmax_t)dip->i_number)); error = VOP_ACCESS(dvp, VEXEC, cred, cnp->cn_thread); if(error) @@ -626,8 +633,8 @@ return (EROFS); if(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') { - dprintf(("ntfs_lookup: faking . directory in %d\n", - dip->i_number)); + dprintf(("ntfs_lookup: faking . directory in %ju\n", + (uintmax_t)dip->i_number)); VREF(dvp); *ap->a_vpp = dvp; @@ -635,8 +642,8 @@ } else if (cnp->cn_flags & ISDOTDOT) { struct ntvattr *vap; - dprintf(("ntfs_lookup: faking .. directory in %d\n", - dip->i_number)); + dprintf(("ntfs_lookup: faking .. directory in %ju\n", + (uintmax_t)dip->i_number)); error = ntfs_ntvattrget(ntmp, dip, NTFS_A_NAME, NULL, 0, &vap); if(error) @@ -659,8 +666,8 @@ return (error); } - dprintf(("ntfs_lookup: found ino: %d\n", - VTONT(*ap->a_vpp)->i_number)); + dprintf(("ntfs_lookup: found ino: %ju\n", + (uintmax_t)VTONT(*ap->a_vpp)->i_number)); } if (cnp->cn_flags & MAKEENTRY) Modified: soc2011/gk/ino64-head/sys/fs/tmpfs/tmpfs_vfsops.c ============================================================================== --- soc2011/gk/ino64-head/sys/fs/tmpfs/tmpfs_vfsops.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/fs/tmpfs/tmpfs_vfsops.c Sun Jun 5 16:20:38 2011 (r222840) @@ -240,7 +240,8 @@ free(tmp, M_TMPFSMNT); return error; } - KASSERT(root->tn_id == 2, ("tmpfs root with invalid ino: %d", root->tn_id)); + KASSERT(root->tn_id == 2, + ("tmpfs root with invalid ino: %ju", (uintmax_t)root->tn_id)); tmp->tm_root = root; MNT_ILOCK(mp); Modified: soc2011/gk/ino64-head/sys/kern/uipc_usrreq.c ============================================================================== --- soc2011/gk/ino64-head/sys/kern/uipc_usrreq.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/kern/uipc_usrreq.c Sun Jun 5 16:20:38 2011 (r222840) @@ -2384,7 +2384,7 @@ db_printf("unp_socket: %p unp_vnode: %p\n", unp->unp_socket, unp->unp_vnode); - db_printf("unp_ino: %d unp_conn: %p\n", unp->unp_ino, + db_printf("unp_ino: %ju unp_conn: %p\n", (uintmax_t)unp->unp_ino, unp->unp_conn); db_printf("unp_refs:\n"); Modified: soc2011/gk/ino64-head/sys/security/mac_lomac/mac_lomac.c ============================================================================== --- soc2011/gk/ino64-head/sys/security/mac_lomac/mac_lomac.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/security/mac_lomac/mac_lomac.c Sun Jun 5 16:20:38 2011 (r222840) @@ -565,11 +565,11 @@ pgid = p->p_pgrp->pg_id; /* XXX could be stale? */ if (vp != NULL && VOP_GETATTR(vp, &va, curthread->td_ucred) == 0) { log(LOG_INFO, "LOMAC: level-%s subject p%dg%du%d:%s demoted to" - " level %s after %s a level-%s %s (inode=%ld, " + " level %s after %s a level-%s %s (inode=%ju, " "mountpount=%s)\n", subjlabeltext, p->p_pid, pgid, curthread->td_ucred->cr_uid, p->p_comm, subjtext, actionname, objlabeltext, objname, - va.va_fileid, vp->v_mount->mnt_stat.f_mntonname); + (uintmax_t)va.va_fileid, vp->v_mount->mnt_stat.f_mntonname); } else { log(LOG_INFO, "LOMAC: level-%s subject p%dg%du%d:%s demoted to" " level %s after %s a level-%s %s\n", Modified: soc2011/gk/ino64-head/sys/ufs/ffs/ffs_alloc.c ============================================================================== --- soc2011/gk/ino64-head/sys/ufs/ffs/ffs_alloc.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/ufs/ffs/ffs_alloc.c Sun Jun 5 16:20:38 2011 (r222840) @@ -598,7 +598,8 @@ */ #ifdef DEBUG if (prtrealloc) - printf("realloc: ino %d, lbns %jd-%jd\n\told:", ip->i_number, + printf("realloc: ino %jd, lbns %jd-%jd\n\told:", + (intmax_t)ip->i_number, (intmax_t)start_lbn, (intmax_t)end_lbn); #endif blkno = newblk; @@ -2185,8 +2186,8 @@ inosused = cg_inosused(cgp); ino %= fs->fs_ipg; if (isclr(inosused, ino)) { - printf("dev = %s, ino = %u, fs = %s\n", devtoname(dev), - ino + cg * fs->fs_ipg, fs->fs_fsmnt); + printf("dev = %s, ino = %ju, fs = %s\n", devtoname(dev), + (uintmax_t)(ino + cg * fs->fs_ipg), fs->fs_fsmnt); if (fs->fs_ronly == 0) panic("ffs_freefile: freeing free inode"); } @@ -2336,8 +2337,9 @@ struct thread *td = curthread; /* XXX */ struct proc *p = td->td_proc; - log(LOG_ERR, "pid %d (%s), uid %d inumber %d on %s: %s\n", - p->p_pid, p->p_comm, td->td_ucred->cr_uid, inum, fs->fs_fsmnt, cp); + log(LOG_ERR, "pid %d (%s), uid %d inumber %ju on %s: %s\n", + p->p_pid, p->p_comm, td->td_ucred->cr_uid, (uintmax_t)inum, + fs->fs_fsmnt, cp); } /* Modified: soc2011/gk/ino64-head/sys/ufs/ffs/ffs_snapshot.c ============================================================================== --- soc2011/gk/ino64-head/sys/ufs/ffs/ffs_snapshot.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/ufs/ffs/ffs_snapshot.c Sun Jun 5 16:20:38 2011 (r222840) @@ -681,7 +681,7 @@ VI_LOCK(devvp); fs->fs_snapinum[snaploc] = ip->i_number; if (ip->i_nextsnap.tqe_prev != 0) - panic("ffs_snapshot: %d already on list", ip->i_number); + panic("ffs_snapshot: %ju already on list", (uintmax_t)ip->i_number); TAILQ_INSERT_TAIL(&sn->sn_head, ip, i_nextsnap); devvp->v_vflag |= VV_COPYONWRITE; VI_UNLOCK(devvp); @@ -1561,8 +1561,8 @@ if (xp != NULL) vrele(ITOV(ip)); else if (snapdebug) - printf("ffs_snapgone: lost snapshot vnode %d\n", - ip->i_number); + printf("ffs_snapgone: lost snapshot vnode %ju\n", + (uintmax_t)ip->i_number); /* * Delete snapshot inode from superblock. Keep list dense. */ @@ -1821,9 +1821,10 @@ if (size == fs->fs_bsize) { #ifdef DEBUG if (snapdebug) - printf("%s %d lbn %jd from inum %d\n", - "Grabonremove: snapino", ip->i_number, - (intmax_t)lbn, inum); + printf("%s %ju lbn %jd from inum %ju\n", + "Grabonremove: snapino", + (uintmax_t)ip->i_number, (intmax_t)lbn, + (uintmax_t)inum); #endif if (lbn < NDADDR) { DIP_SET(ip, i_db[lbn], bno); @@ -1854,9 +1855,9 @@ break; #ifdef DEBUG if (snapdebug) - printf("%s%d lbn %jd %s %d size %ld to blkno %jd\n", - "Copyonremove: snapino ", ip->i_number, - (intmax_t)lbn, "for inum", inum, size, + printf("%s%ju lbn %jd %s %ju size %ld to blkno %jd\n", + "Copyonremove: snapino ", (uintmax_t)ip->i_number, + (intmax_t)lbn, "for inum", (uintmax_t)inum, size, (intmax_t)cbp->b_blkno); #endif /* @@ -1986,8 +1987,8 @@ */ VI_LOCK(devvp); if (ip->i_nextsnap.tqe_prev != 0) - panic("ffs_snapshot_mount: %d already on list", - ip->i_number); + panic("ffs_snapshot_mount: %ju already on list", + (uintmax_t)ip->i_number); else TAILQ_INSERT_TAIL(&sn->sn_head, ip, i_nextsnap); vp->v_vflag |= VV_SYSTEM; @@ -2331,12 +2332,13 @@ break; #ifdef DEBUG if (snapdebug) { - printf("Copyonwrite: snapino %d lbn %jd for ", - ip->i_number, (intmax_t)lbn); + printf("Copyonwrite: snapino %ju lbn %jd for ", + (intmax_t)ip->i_number, (intmax_t)lbn); if (bp->b_vp == devvp) printf("fs metadata"); else - printf("inum %d", VTOI(bp->b_vp)->i_number); + printf("inum %ju", + (uintmax_t)VTOI(bp->b_vp)->i_number); printf(" lblkno %jd to blkno %jd\n", (intmax_t)bp->b_lblkno, (intmax_t)cbp->b_blkno); } Modified: soc2011/gk/ino64-head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- soc2011/gk/ino64-head/sys/ufs/ffs/ffs_softdep.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/ufs/ffs/ffs_softdep.c Sun Jun 5 16:20:38 2011 (r222840) @@ -4119,8 +4119,8 @@ KASSERT(jaddref != NULL, ("softdep_setup_mkdir: No addref structure present.")); KASSERT(jaddref->ja_parent == dp->i_number, - ("softdep_setup_mkdir: bad parent %d", - jaddref->ja_parent)); + ("softdep_setup_mkdir: bad parent %ju", + (uintmax_t)jaddref->ja_parent)); jaddref->ja_mode = ip->i_mode; TAILQ_INSERT_BEFORE(&jaddref->ja_ref, &dotaddref->ja_ref, if_deps); @@ -7580,8 +7580,8 @@ if ((dap->da_state & ATTACHED) == 0) panic("newdirrem: not ATTACHED"); if (dap->da_newinum != ip->i_number) - panic("newdirrem: inum %d should be %d", - ip->i_number, dap->da_newinum); + panic("newdirrem: inum %ju should be %ju", + (uintmax_t)ip->i_number, (uintmax_t)dap->da_newinum); /* * If we are deleting a changed name that never made it to disk, * then return the dirrem describing the previous inode (which @@ -8474,9 +8474,10 @@ ep = (struct direct *) ((char *)bp->b_data + dap->da_offset); if (ep->d_ino != dap->da_newinum) - panic("%s: dir inum %d != new %d", + panic("%s: dir inum %ju != new %ju", "initiate_write_filepage", - ep->d_ino, dap->da_newinum); + (uintmax_t)ep->d_ino, + (uintmax_t)dap->da_newinum); if (dap->da_state & DIRCHG) ep->d_ino = dap->da_previous->dm_oldinum; else @@ -8705,9 +8706,10 @@ inon = TAILQ_NEXT(inodedep, id_unlinked); freelink = inon ? inon->id_ino : 0; if (freelink != dp->di_freelink) - panic("ino %p(0x%X) %d, %d != %d", - inodedep, inodedep->id_state, inodedep->id_ino, - freelink, dp->di_freelink); + panic("ino %p(0x%X) %ju, %ju != %ju", + inodedep, inodedep->id_state, + (uintmax_t)inodedep->id_ino, + (uintmax_t)freelink, (uintmax_t)dp->di_freelink); } /* * If the bitmap is not yet written, then the allocated @@ -9029,10 +9031,11 @@ cgp = (struct cg *)bp->b_data; inosused = cg_inosused(cgp); if (isset(inosused, ino % fs->fs_ipg)) - panic("softdep_setup_inofree: inode %d not freed.", ino); + panic("softdep_setup_inofree: inode %ju not freed.", + (uintmax_t)ino); if (inodedep_lookup(mp, ino, 0, &inodedep)) - panic("softdep_setup_inofree: ino %d has existing inodedep %p", - ino, inodedep); + panic("softdep_setup_inofree: ino %ju has existing inodedep %p", + (uintmax_t)ino, inodedep); if (wkhd) { LIST_FOREACH_SAFE(wk, wkhd, wk_list, wkn) { if (wk->wk_type != D_JADDREF) @@ -9199,8 +9202,8 @@ jaddref->ja_state |= UNDONE; stat_jaddref++; } else if ((bp->b_xflags & BX_BKGRDMARKER) == 0) - panic("initiate_write_bmsafemap: inode %d " - "marked free", jaddref->ja_ino); + panic("initiate_write_bmsafemap: inode %ju " + "marked free", (uintmax_t)jaddref->ja_ino); } } /* @@ -11192,7 +11195,8 @@ if (dap == LIST_FIRST(diraddhdp)) { inodedep_lookup(UFSTOVFS(ump), inum, 0, &inodedep); panic("flush_pagedep_deps: failed to flush " - "inodedep %p ino %d dap %p", inodedep, inum, dap); + "inodedep %p ino %ju dap %p", + inodedep, (uintmax_t)inum, dap); } } if (error) Modified: soc2011/gk/ino64-head/sys/ufs/ufs/ufs_acl.c ============================================================================== --- soc2011/gk/ino64-head/sys/ufs/ufs/ufs_acl.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/ufs/ufs/ufs_acl.c Sun Jun 5 16:20:38 2011 (r222840) @@ -182,8 +182,8 @@ * are unsafe. */ printf("ufs_getacl_nfs4(): Loaded invalid ACL (" - "%d bytes), inumber %d on %s\n", len, - ip->i_number, ip->i_fs->fs_fsmnt); + "%d bytes), inumber %ju on %s\n", len, + (uintmax_t)ip->i_number, ip->i_fs->fs_fsmnt); return (EPERM); } @@ -191,8 +191,8 @@ error = acl_nfs4_check(aclp, vp->v_type == VDIR); if (error) { printf("ufs_getacl_nfs4(): Loaded invalid ACL " - "(failed acl_nfs4_check), inumber %d on %s\n", - ip->i_number, ip->i_fs->fs_fsmnt); + "(failed acl_nfs4_check), inumber %ju on %s\n", + (uintmax_t)ip->i_number, ip->i_fs->fs_fsmnt); return (EPERM); } @@ -259,8 +259,8 @@ * DAC protections are unsafe. */ printf("ufs_get_oldacl(): Loaded invalid ACL " - "(len = %d), inumber %d on %s\n", len, - ip->i_number, ip->i_fs->fs_fsmnt); + "(len = %d), inumber %ju on %s\n", len, + (uintmax_t)ip->i_number, ip->i_fs->fs_fsmnt); return (EPERM); } Modified: soc2011/gk/ino64-head/sys/ufs/ufs/ufs_lookup.c ============================================================================== --- soc2011/gk/ino64-head/sys/ufs/ufs/ufs_lookup.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/ufs/ufs/ufs_lookup.c Sun Jun 5 16:20:38 2011 (r222840) @@ -1209,8 +1209,8 @@ ufsdirhash_remove(dp, rep, dp->i_offset); #endif if (ip && rep->d_ino != ip->i_number) - panic("ufs_dirremove: ip %d does not match dirent ino %d\n", - ip->i_number, rep->d_ino); + panic("ufs_dirremove: ip %ju does not match dirent ino %ju\n", + (uintmax_t)ip->i_number, (uintmax_t)rep->d_ino); if (dp->i_count == 0) { /* * First entry in block: set d_ino to zero. Modified: soc2011/gk/ino64-head/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- soc2011/gk/ino64-head/sys/ufs/ufs/ufs_vnops.c Sun Jun 5 16:20:10 2011 (r222839) +++ soc2011/gk/ino64-head/sys/ufs/ufs/ufs_vnops.c Sun Jun 5 16:20:38 2011 (r222840) @@ -1485,8 +1485,8 @@ if (error) panic("ufs_rename: from entry went away!"); if (ino != fip->i_number) - panic("ufs_rename: ino mismatch %d != %d\n", ino, - fip->i_number); + panic("ufs_rename: ino mismatch %ju != %ju\n", + (uintmax_t)ino, (uintmax_t)fip->i_number); } /* * If the source is a directory with a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110605162038.71B32106566C>