Date: Sat, 14 Jul 2012 16:34:17 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r238451 - projects/fuse/sys/fs/fuse Message-ID: <201207141634.q6EGYHaC095675@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sat Jul 14 16:34:17 2012 New Revision: 238451 URL: http://svn.freebsd.org/changeset/base/238451 Log: Fix the format strings and u/intmax_t casts for the printed types. Reported by: pho Modified: projects/fuse/sys/fs/fuse/fuse_internal.c projects/fuse/sys/fs/fuse/fuse_node.c projects/fuse/sys/fs/fuse/fuse_vnops.c Modified: projects/fuse/sys/fs/fuse/fuse_internal.c ============================================================================== --- projects/fuse/sys/fs/fuse/fuse_internal.c Sat Jul 14 15:48:30 2012 (r238450) +++ projects/fuse/sys/fs/fuse/fuse_internal.c Sat Jul 14 16:34:17 2012 (r238451) @@ -583,7 +583,7 @@ fuse_internal_forget_send(struct mount * struct fuse_dispatcher fdi; struct fuse_forget_in *ffi; - debug_printf("mp=%p, nodeid=%jd, nlookup=%jd\n", + debug_printf("mp=%p, nodeid=%ju, nlookup=%ju\n", mp, (uintmax_t)nodeid, (uintmax_t)nlookup); /* Modified: projects/fuse/sys/fs/fuse/fuse_node.c ============================================================================== --- projects/fuse/sys/fs/fuse/fuse_node.c Sat Jul 14 15:48:30 2012 (r238450) +++ projects/fuse/sys/fs/fuse/fuse_node.c Sat Jul 14 16:34:17 2012 (r238451) @@ -301,7 +301,8 @@ fuse_vnode_savesize(struct vnode *vp, st struct fuse_setattr_in *fsai; int err = 0; - DEBUG("inode=%jd size=%jd\n", VTOI(vp), fvdat->filesize); + DEBUG("inode=%ju size=%ju\n", (uintmax_t)VTOI(vp), + (uintmax_t)fvdat->filesize); ASSERT_VOP_ELOCKED(vp, "fuse_io_extend"); if (fuse_isdeadfs(vp)) { @@ -353,7 +354,7 @@ fuse_vnode_refreshsize(struct vnode *vp, return; VOP_GETATTR(vp, &va, cred); - DEBUG("refreshed file size: %jd\n", VTOFUD(vp)->filesize); + DEBUG("refreshed file size: %jd\n", (intmax_t)VTOFUD(vp)->filesize); } int @@ -363,8 +364,9 @@ fuse_vnode_setsize(struct vnode *vp, str off_t oldsize; int err = 0; - DEBUG("inode=%jd oldsize=%jd newsize=%jd\n", - VTOI(vp), fvdat->filesize, newsize); + DEBUG("inode=%ju oldsize=%ju newsize=%ju\n", + (uintmax_t)VTOI(vp), (uintmax_t)fvdat->filesize, + (uintmax_t)newsize); ASSERT_VOP_ELOCKED(vp, "fuse_vnode_setsize"); oldsize = fvdat->filesize; Modified: projects/fuse/sys/fs/fuse/fuse_vnops.c ============================================================================== --- projects/fuse/sys/fs/fuse/fuse_vnops.c Sat Jul 14 15:48:30 2012 (r238450) +++ projects/fuse/sys/fs/fuse/fuse_vnops.c Sat Jul 14 16:34:17 2012 (r238451) @@ -221,7 +221,7 @@ fuse_vnop_access(struct vop_access_args int err; - DEBUG2G("inode=%jd\n", VTOI(vp)); + DEBUG2G("inode=%ju\n", (uintmax_t)VTOI(vp)); if (fuse_isdeadfs(vp)) { if (vnode_isvroot(vp)) { @@ -339,7 +339,8 @@ fuse_vnop_create(struct vop_create_args if ((vap->va_type != VREG) || !fsess_isimpl(mp, FUSE_CREATE)) { goto good_old; } - debug_printf("parent nid = %ju, mode = %x\n", (uintmax_t)parentnid, mode); + debug_printf("parent nid = %ju, mode = %x\n", (uintmax_t)parentnid, + mode); fdisp_init(fdip, sizeof(*foi) + cnp->cn_namelen + 1); if (!fsess_isimpl(mp, FUSE_CREATE)) { @@ -502,7 +503,7 @@ fuse_vnop_getattr(struct vop_getattr_arg int dataflags; struct fuse_dispatcher fdi; - DEBUG2G("inode=%jd\n", VTOI(vp)); + DEBUG2G("inode=%ju\n", (uintmax_t)VTOI(vp)); dataflags = fuse_get_mpdata(vnode_mount(vp))->dataflags; @@ -516,7 +517,7 @@ fuse_vnop_getattr(struct vop_getattr_arg if ((fvdat->flag & FN_SIZECHANGE) != 0) { vap->va_size = fvdat->filesize; } - debug_printf("return cached: inode=%jd\n", VTOI(vp)); + debug_printf("return cached: inode=%ju\n", (uintmax_t)VTOI(vp)); return 0; } if (!(dataflags & FSESS_INITED)) { @@ -591,7 +592,7 @@ fuse_vnop_inactive(struct vop_inactive_a int type, need_flush = 1; - DEBUG("inode=%jd\n", (uintmax_t)VTOI(vp)); + DEBUG("inode=%ju\n", (uintmax_t)VTOI(vp)); for (type = 0; type < FUFH_MAXTYPE; type++) { fufh = &(fvdat->fufh[type]); @@ -705,8 +706,8 @@ fuse_vnop_lookup(struct vop_lookup_args uint64_t nid; struct fuse_access_param facp; - DEBUG2G("parent_inode=%jd - %*s\n", - VTOI(dvp), (int)cnp->cn_namelen, cnp->cn_nameptr); + DEBUG2G("parent_inode=%ju - %*s\n", + (uintmax_t)VTOI(dvp), (int)cnp->cn_namelen, cnp->cn_nameptr); if (fuse_isdeadfs(dvp)) { *vpp = NULL; @@ -1166,7 +1167,7 @@ fuse_vnop_open(struct vop_open_args *ap) int error, isdir = 0; - DEBUG2G("inode=%jd mode=0x%x\n", VTOI(vp), mode); + DEBUG2G("inode=%ju mode=0x%x\n", (uintmax_t)VTOI(vp), mode); if (fuse_isdeadfs(vp)) { return ENXIO; @@ -1207,8 +1208,8 @@ fuse_vnop_read(struct vop_read_args *ap) int ioflag = ap->a_ioflag; struct ucred *cred = ap->a_cred; - DEBUG2G("inode=%jd offset=%jd resid=%zd\n", - VTOI(vp), uio->uio_offset, uio->uio_resid); + DEBUG2G("inode=%ju offset=%jd resid=%zd\n", + (uintmax_t)VTOI(vp), uio->uio_offset, uio->uio_resid); if (fuse_isdeadfs(vp)) { return ENXIO; @@ -1240,7 +1241,7 @@ fuse_vnop_readdir(struct vop_readdir_arg int err = 0; int freefufh = 0; - DEBUG2G("inode=%jd\n", VTOI(vp)); + DEBUG2G("inode=%ju\n", (uintmax_t)VTOI(vp)); if (fuse_isdeadfs(vp)) { return ENXIO; @@ -1290,7 +1291,7 @@ fuse_vnop_readlink(struct vop_readlink_a struct fuse_dispatcher fdi; int err; - DEBUG2G("inode=%jd\n", VTOI(vp)); + DEBUG2G("inode=%ju\n", (uintmax_t)VTOI(vp)); if (fuse_isdeadfs(vp)) { return ENXIO; @@ -1337,7 +1338,7 @@ fuse_vnop_reclaim(struct vop_reclaim_arg if (!fvdat) { panic("FUSE: no vnode data during recycling"); } - DEBUG("inode=%jd\n", (uintmax_t)VTOI(vp)); + DEBUG("inode=%ju\n", (uintmax_t)VTOI(vp)); for (type = 0; type < FUFH_MAXTYPE; type++) { fufh = &(fvdat->fufh[type]); @@ -1377,8 +1378,8 @@ fuse_vnop_remove(struct vop_remove_args int err; - DEBUG2G("inode=%jd name=%*s\n", - VTOI(vp), (int)cnp->cn_namelen, cnp->cn_nameptr); + DEBUG2G("inode=%ju name=%*s\n", + (uintmax_t)VTOI(vp), (int)cnp->cn_namelen, cnp->cn_nameptr); if (fuse_isdeadfs(vp)) { panic("FUSE: fuse_vnop_remove(): called on a dead file system"); @@ -1420,9 +1421,9 @@ fuse_vnop_rename(struct vop_rename_args int err = 0; - DEBUG2G("from: inode=%jd name=%*s -> to: inode=%jd name=%*s\n", - VTOI(fvp), (int)fcnp->cn_namelen, fcnp->cn_nameptr, - (tvp == NULL ? (intmax_t)-1 : VTOI(tvp)), + DEBUG2G("from: inode=%ju name=%*s -> to: inode=%ju name=%*s\n", + (uintmax_t)VTOI(fvp), (int)fcnp->cn_namelen, fcnp->cn_nameptr, + (uintmax_t)(tvp == NULL ? -1 : VTOI(tvp)), (int)tcnp->cn_namelen, tcnp->cn_nameptr); if (fuse_isdeadfs(fdvp)) { @@ -1495,7 +1496,7 @@ fuse_vnop_rmdir(struct vop_rmdir_args *a int err; - DEBUG2G("inode=%jd\n", VTOI(vp)); + DEBUG2G("inode=%ju\n", (uintmax_t)VTOI(vp)); if (fuse_isdeadfs(vp)) { panic("FUSE: fuse_vnop_rmdir(): called on a dead file system"); @@ -1537,7 +1538,7 @@ fuse_vnop_setattr(struct vop_setattr_arg int sizechanged = 0; uint64_t newsize = 0; - DEBUG2G("inode=%jd\n", VTOI(vp)); + DEBUG2G("inode=%ju\n", (uintmax_t)VTOI(vp)); if (fuse_isdeadfs(vp)) { return ENXIO; @@ -1714,8 +1715,8 @@ fuse_vnop_symlink(struct vop_symlink_arg int err; size_t len; - DEBUG2G("inode=%jd name=%*s\n", - VTOI(dvp), (int)cnp->cn_namelen, cnp->cn_nameptr); + DEBUG2G("inode=%ju name=%*s\n", + (uintmax_t)VTOI(dvp), (int)cnp->cn_namelen, cnp->cn_nameptr); if (fuse_isdeadfs(dvp)) { panic("FUSE: fuse_vnop_symlink(): called on a dead file system"); @@ -2053,9 +2054,8 @@ fuse_vnop_print(struct vop_print_args *a { struct fuse_vnode_data *fvdat = VTOFUD(ap->a_vp); - printf("nodeid: %ju, parent nodeid: %ju, " - "nlookup: %ju, flag: %#x\n", - VTOILLU(ap->a_vp), (uintmax_t)fvdat->parent_nid, + printf("nodeid: %ju, parent nodeid: %ju, nlookup: %ju, flag: %#x\n", + (uintmax_t)VTOILLU(ap->a_vp), (uintmax_t)fvdat->parent_nid, (uintmax_t)fvdat->nlookup, fvdat->flag);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207141634.q6EGYHaC095675>