Date: Wed, 19 Oct 2005 08:19:04 GMT From: soc-chenk <soc-chenk@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 85533 for review Message-ID: <200510190819.j9J8J447052674@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=85533 Change 85533 by soc-chenk@soc-chenk_leavemealone on 2005/10/19 08:18:54 Apply Anish's further machine independecy patch Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fmaster.c#4 edit .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#22 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fmaster.c#4 (text+ko) ==== @@ -348,16 +348,16 @@ pp_fuse_entry_out(struct fuse_entry_out *stru) { fuprintf("fuse_entry_out -- nodeid: %llu, generation: %llu, entry_valid: %llu, attr_valid: %llu, entry_valid_nsec: %i, attr_valid_nsec: %i, struct attr...\n", - stru->nodeid, stru->generation, stru->entry_valid, stru->attr_valid, stru->entry_valid_nsec, stru->attr_valid_nsec); + (unsigned long long)stru->nodeid, (unsigned long long)stru->generation, (unsigned long long)stru->entry_valid, (unsigned long long)stru->attr_valid, stru->entry_valid_nsec, stru->attr_valid_nsec); fuprintf("\tattr -- ino: %llu, size: %llu, blocks: %llu, atime: %llu, mtime: %llu, ctime: %llu, atimensec: %i, mtimensec: %i, ctimensec: %i, mode: %i, nlink: %i, uid: %i, gid: %i, rdev: %i\n", - stru->attr.ino, stru->attr.size, stru->attr.blocks, stru->attr.atime, stru->attr.mtime, stru->attr.ctime, stru->attr.atimensec, stru->attr.mtimensec, stru->attr.ctimensec, stru->attr.mode, stru->attr.nlink, stru->attr.uid, stru->attr.gid, stru->attr.rdev); + (unsigned long long)stru->attr.ino, (unsigned long long)stru->attr.size, (unsigned long long)stru->attr.blocks, (unsigned long long)stru->attr.atime, (unsigned long long)stru->attr.mtime, (unsigned long long)stru->attr.ctime, stru->attr.atimensec, stru->attr.mtimensec, stru->attr.ctimensec, stru->attr.mode, stru->attr.nlink, stru->attr.uid, stru->attr.gid, stru->attr.rdev); } static void pp_fuse_open_out(struct fuse_open_out *stru) { - fuprintf("fuse_open_out -- fh: %llu, open_flags: %i, padding: %i\n", stru->fh, stru->open_flags, stru->padding); + fuprintf("fuse_open_out -- fh: %llu, open_flags: %i, padding: %i\n", (unsigned long long)stru->fh, stru->open_flags, stru->padding); } static void @@ -384,17 +384,17 @@ pp_fuse_attr_out(struct fuse_attr_out *stru) { fuprintf("fuse_entry_out -- attr_valid: %llu, attr_valid_nsec: %i, dummy: %i, struct attr...\n", - stru->attr_valid, stru->attr_valid_nsec, stru->dummy); + (unsigned long long)stru->attr_valid, stru->attr_valid_nsec, stru->dummy); fuprintf("\tattr -- ino: %llu, size: %llu, blocks: %llu, atime: %llu, mtime: %llu, ctime: %llu, atimensec: %i, mtimensec: %i, ctimensec: %i, mode: %i, nlink: %i, uid: %i, gid: %i, rdev: %i\n", - stru->attr.ino, stru->attr.size, stru->attr.blocks, stru->attr.atime, stru->attr.mtime, stru->attr.ctime, stru->attr.atimensec, stru->attr.mtimensec, stru->attr.ctimensec, stru->attr.mode, stru->attr.nlink, stru->attr.uid, stru->attr.gid, stru->attr.rdev); + (unsigned long long)stru->attr.ino, (unsigned long long)stru->attr.size, (unsigned long long)stru->attr.blocks, (unsigned long long)stru->attr.atime, (unsigned long long)stru->attr.mtime, (unsigned long long)stru->attr.ctime, stru->attr.atimensec, stru->attr.mtimensec, stru->attr.ctimensec, stru->attr.mode, stru->attr.nlink, stru->attr.uid, stru->attr.gid, stru->attr.rdev); } static void pp_fuse_statfs_out(struct fuse_statfs_out *stru) { fuprintf("fuse_statfs_out -- blocks: %llu, bfree: %llu, bavail: %llu, files: %llu, ffree: %llu, bsize: %i, namelen: %i\n", - stru->st.blocks, stru->st.bfree, stru->st.bavail, stru->st.files, stru->st.ffree, stru->st.bsize, stru->st.namelen); + (unsigned long long)stru->st.blocks, (unsigned long long)stru->st.bfree, (unsigned long long)stru->st.bavail, (unsigned long long)stru->st.files, (unsigned long long)stru->st.ffree, stru->st.bsize, stru->st.namelen); } static void ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#22 (text+ko) ==== @@ -700,7 +700,7 @@ fuse_ohead_audit(struct fuse_out_header *ohead, struct uio *uio) { fuprintf("\tOut header -- len: %i, error: %i, unique: %llu; iovecs: %d\n", - ohead->len, ohead->error, ohead->unique, uio->uio_iovcnt); + ohead->len, ohead->error, (unsigned long long)ohead->unique, uio->uio_iovcnt); if (uio->uio_resid + sizeof(struct fuse_out_header) != ohead->len) { fuprintf("Format error: body size differs from size claimed by header\n"); @@ -879,8 +879,8 @@ DEBUG2G("in header -- opcode: %2d (\"%s\"), unique: %llu, nodeid: %llu\n", ihead->opcode, fuse_opnames[ihead->opcode], - ihead->unique, - ihead->nodeid); + (unsigned long long)ihead->unique, + (unsigned long long)ihead->nodeid); } __static __inline struct fuse_data * @@ -1196,7 +1196,7 @@ TAILQ_FOREACH_SAFE(fcallbn, &data->fcallb_head, fcallb_link, fcallbn_temp) { fuprintf("bumped into callback #%llu\n", - fcallbn->ticket->unique); + (unsigned long long)fcallbn->ticket->unique); if (fcallbn->ticket->unique == ohead->unique) { found = 1; fuse_callbn_remove(fcallbn); @@ -1471,7 +1471,7 @@ struct fuse_forget_in *ffi; int err = 0; - DEBUG("sending FORGET with %llu lookups\n", nlookup); + DEBUG("sending FORGET with %llu lookups\n", (unsigned long long)nlookup); fdip->iosize = sizeof(*ffi); if (fdip->tick) { @@ -2137,7 +2137,7 @@ sbp->f_namemax = fsfo->st.namelen; DEBUG("fuse_statfs_out -- blocks: %llu, bfree: %llu, bavail: %llu, files: %llu, ffree: %llu, bsize: %i, namelen: %i\n", - fsfo->st.blocks, fsfo->st.bfree, fsfo->st.bavail, fsfo->st.files, fsfo->st.ffree, fsfo->st.bsize, fsfo->st.namelen); + (unsigned long long)fsfo->st.blocks, (unsigned long long)fsfo->st.bfree, (unsigned long long)fsfo->st.bavail, (unsigned long long)fsfo->st.files, (unsigned long long)fsfo->st.ffree, fsfo->st.bsize, fsfo->st.namelen); ticket_drop(fdi.tick); sx_sunlock(fdi.slock); @@ -2164,7 +2164,7 @@ int myflags = LK_EXCLUSIVE; DEBUG2G("mp %p: %s\n", mp, mp->mnt_stat.f_mntfromname); - DEBUG("been asked for vno #%llu\n", nodeid); + DEBUG("been asked for vno #%llu\n", (unsigned long long)nodeid); fmnt = mp->mnt_data; if (nodeid == FUSE_ROOT_INODE) { @@ -2215,7 +2215,7 @@ } if (vp2) { - DEBUG("gee, vfs hash collision for node #%llu\n", nodeid); + DEBUG("gee, vfs hash collision for node #%llu\n", (unsigned long long)nodeid); vpp = &vp2; goto audit; } @@ -2393,7 +2393,7 @@ static __inline void fat2vat(struct mount *mp, struct fuse_attr *fat, struct vattr *vap) { - DEBUG("node #%llu, mode 0%o\n", fat->ino, fat->mode); + DEBUG("node #%llu, mode 0%o\n", (unsigned long long)fat->ino, fat->mode); vap->va_fsid = mp->mnt_stat.f_fsid.val[0]; vap->va_fileid = fat->ino; /* XXX cast from 64 bits to 32 */ @@ -3560,7 +3560,7 @@ if (fp->f_flag & O_DIRECT || fufh->flags & FUSEFH_DIRECTIO) { DEBUG2G("direct read of vnode %llu via file handle %llu\n", - VTOI32(fp->f_vnode), fufh->fh_id); + VTOI32(fp->f_vnode), (unsigned long long)fufh->fh_id); err = fuse_read_directbackend(fp->f_vnode, fufh, uio, cred, td, FUSE_READ, fuse_std_buffeater, NULL); @@ -3830,7 +3830,7 @@ ((char *)cookediov->base)[bytesavail] = '\0'; DEBUG("bytesavail %d, fudge->off %llu, fudge->namelen %d, uio->uio_offset %d, name %s\n", - bytesavail, fudge->off, fudge->namelen, (int)uio->uio_offset, + bytesavail, (unsigned long long)fudge->off, fudge->namelen, (int)uio->uio_offset, (char *)cookediov->base + sizeof(struct dirent) - MAXNAMLEN - 1); err = uiomove(cookediov->base, cookediov->len, uio); @@ -4901,7 +4901,7 @@ if (fp->f_flag & O_DIRECT || fufh->flags & FUSEFH_DIRECTIO) { DEBUG2G("direct write of vnode %llu via file handle %llu\n", - VTOI32(fp->f_vnode), fufh->fh_id); + VTOI32(fp->f_vnode), (unsigned long long)fufh->fh_id); err = fuse_write_directbackend(fp->f_vnode, fufh->fh_id, uio, cred, td); } else { @@ -4990,7 +4990,7 @@ if (err) goto out; - DEBUG2G("vp #%llu, fufh #%llu\n", VTOI32(vp), fufh->fh_id); + DEBUG2G("vp #%llu, fufh #%llu\n", VTOI32(vp), (unsigned long long)fufh->fh_id); if (bp->b_iocmd == BIO_READ) { struct fuse_read_in *fri; @@ -5143,7 +5143,7 @@ struct fuse_vnode_data *fvdat = ap->a_vp->v_data; printf("nodeid: %llu, fh_counter: %d, nlookup: %llu\n", - VTOI32(ap->a_vp), fvdat->fh_counter, fvdat->nlookup); + VTOI32(ap->a_vp), fvdat->fh_counter, (unsigned long long)fvdat->nlookup); return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510190819.j9J8J447052674>