Date: Mon, 23 Apr 2012 13:21:28 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r234605 - in head/sys: fs/ext2fs fs/hpfs fs/msdosfs fs/nfsclient kern nfsclient sys ufs/ffs ufs/ufs Message-ID: <201204231321.q3NDLS5O099364@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Mon Apr 23 13:21:28 2012 New Revision: 234605 URL: http://svn.freebsd.org/changeset/base/234605 Log: Remove unused thread argument from vtruncbuf(). Reviewed by: kib Modified: head/sys/fs/ext2fs/ext2_inode.c head/sys/fs/hpfs/hpfs_vnops.c head/sys/fs/msdosfs/denode.h head/sys/fs/msdosfs/msdosfs_denode.c head/sys/fs/msdosfs/msdosfs_lookup.c head/sys/fs/msdosfs/msdosfs_vnops.c head/sys/fs/nfsclient/nfs_clbio.c head/sys/kern/vfs_subr.c head/sys/nfsclient/nfs_bio.c head/sys/sys/vnode.h head/sys/ufs/ffs/ffs_extern.h head/sys/ufs/ffs/ffs_inode.c head/sys/ufs/ffs/ffs_snapshot.c head/sys/ufs/ffs/ffs_vnops.c head/sys/ufs/ufs/ufs_inode.c head/sys/ufs/ufs/ufs_lookup.c head/sys/ufs/ufs/ufs_vnops.c head/sys/ufs/ufs/ufsmount.h Modified: head/sys/fs/ext2fs/ext2_inode.c ============================================================================== --- head/sys/fs/ext2fs/ext2_inode.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/fs/ext2fs/ext2_inode.c Mon Apr 23 13:21:28 2012 (r234605) @@ -249,7 +249,7 @@ ext2_truncate(vp, length, flags, cred, t bcopy((caddr_t)&oip->i_db[0], (caddr_t)newblks, sizeof(newblks)); bcopy((caddr_t)oldblks, (caddr_t)&oip->i_db[0], sizeof(oldblks)); oip->i_size = osize; - error = vtruncbuf(ovp, cred, td, length, (int)fs->e2fs_bsize); + error = vtruncbuf(ovp, cred, length, (int)fs->e2fs_bsize); if (error && (allerror == 0)) allerror = error; vnode_pager_setsize(ovp, length); Modified: head/sys/fs/hpfs/hpfs_vnops.c ============================================================================== --- head/sys/fs/hpfs/hpfs_vnops.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/fs/hpfs/hpfs_vnops.c Mon Apr 23 13:21:28 2012 (r234605) @@ -528,7 +528,7 @@ hpfs_setattr(ap) } if (vap->va_size < hp->h_fn.fn_size) { - error = vtruncbuf(vp, cred, td, vap->va_size, DEV_BSIZE); + error = vtruncbuf(vp, cred, vap->va_size, DEV_BSIZE); if (error) return (error); error = hpfs_truncate(hp, vap->va_size); Modified: head/sys/fs/msdosfs/denode.h ============================================================================== --- head/sys/fs/msdosfs/denode.h Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/fs/msdosfs/denode.h Mon Apr 23 13:21:28 2012 (r234605) @@ -276,6 +276,6 @@ int dosdirempty(struct denode *dep); int createde(struct denode *dep, struct denode *ddep, struct denode **depp, struct componentname *cnp); int deupdat(struct denode *dep, int waitfor); int removede(struct denode *pdep, struct denode *dep); -int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred, struct thread *td); +int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred); int doscheckpath( struct denode *source, struct denode *target); #endif /* _KERNEL */ Modified: head/sys/fs/msdosfs/msdosfs_denode.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_denode.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/fs/msdosfs/msdosfs_denode.c Mon Apr 23 13:21:28 2012 (r234605) @@ -326,12 +326,11 @@ deupdat(dep, waitfor) * Truncate the file described by dep to the length specified by length. */ int -detrunc(dep, length, flags, cred, td) +detrunc(dep, length, flags, cred) struct denode *dep; u_long length; int flags; struct ucred *cred; - struct thread *td; { int error; int allerror; @@ -426,7 +425,7 @@ detrunc(dep, length, flags, cred, td) dep->de_FileSize = length; if (!isadir) dep->de_flag |= DE_UPDATE | DE_MODIFIED; - allerror = vtruncbuf(DETOV(dep), cred, td, length, pmp->pm_bpcluster); + allerror = vtruncbuf(DETOV(dep), cred, length, pmp->pm_bpcluster); #ifdef MSDOSFS_DEBUG if (allerror) printf("detrunc(): vtruncbuf error %d\n", allerror); @@ -504,7 +503,7 @@ deextend(dep, length, cred) error = extendfile(dep, count, NULL, NULL, DE_CLEAR); if (error) { /* truncate the added clusters away again */ - (void) detrunc(dep, dep->de_FileSize, 0, cred, NULL); + (void) detrunc(dep, dep->de_FileSize, 0, cred); return (error); } } @@ -607,7 +606,7 @@ msdosfs_inactive(ap) dep, dep->de_refcnt, vp->v_mount->mnt_flag, MNT_RDONLY); #endif if (dep->de_refcnt <= 0 && (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) { - error = detrunc(dep, (u_long) 0, 0, NOCRED, td); + error = detrunc(dep, (u_long) 0, 0, NOCRED); dep->de_flag |= DE_UPDATE; dep->de_Name[0] = SLOT_DELETED; } Modified: head/sys/fs/msdosfs/msdosfs_lookup.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_lookup.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/fs/msdosfs/msdosfs_lookup.c Mon Apr 23 13:21:28 2012 (r234605) @@ -649,7 +649,7 @@ createde(dep, ddep, depp, cnp) dirclust = de_clcount(pmp, diroffset); error = extendfile(ddep, dirclust, 0, 0, DE_CLEAR); if (error) { - (void)detrunc(ddep, ddep->de_FileSize, 0, NOCRED, NULL); + (void)detrunc(ddep, ddep->de_FileSize, 0, NOCRED); return error; } Modified: head/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_vnops.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/fs/msdosfs/msdosfs_vnops.c Mon Apr 23 13:21:28 2012 (r234605) @@ -476,7 +476,7 @@ msdosfs_setattr(ap) */ break; } - error = detrunc(dep, vap->va_size, 0, cred, td); + error = detrunc(dep, vap->va_size, 0, cred); if (error) return error; } @@ -835,11 +835,11 @@ msdosfs_write(ap) errexit: if (error) { if (ioflag & IO_UNIT) { - detrunc(dep, osize, ioflag & IO_SYNC, NOCRED, NULL); + detrunc(dep, osize, ioflag & IO_SYNC, NOCRED); uio->uio_offset -= resid - uio->uio_resid; uio->uio_resid = resid; } else { - detrunc(dep, dep->de_FileSize, ioflag & IO_SYNC, NOCRED, NULL); + detrunc(dep, dep->de_FileSize, ioflag & IO_SYNC, NOCRED); if (uio->uio_resid != resid) error = 0; } @@ -1429,7 +1429,6 @@ msdosfs_rmdir(ap) struct vnode *dvp = ap->a_dvp; struct componentname *cnp = ap->a_cnp; struct denode *ip, *dp; - struct thread *td = cnp->cn_thread; int error; ip = VTODE(vp); @@ -1467,7 +1466,7 @@ msdosfs_rmdir(ap) /* * Truncate the directory that is being deleted. */ - error = detrunc(ip, (u_long)0, IO_SYNC, cnp->cn_cred, td); + error = detrunc(ip, (u_long)0, IO_SYNC, cnp->cn_cred); cache_purge(vp); out: Modified: head/sys/fs/nfsclient/nfs_clbio.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clbio.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/fs/nfsclient/nfs_clbio.c Mon Apr 23 13:21:28 2012 (r234605) @@ -1817,7 +1817,7 @@ ncl_meta_setsize(struct vnode *vp, struc * truncation point. We may have a B_DELWRI and/or B_CACHE * buffer that now needs to be truncated. */ - error = vtruncbuf(vp, cred, td, nsize, biosize); + error = vtruncbuf(vp, cred, nsize, biosize); lbn = nsize / biosize; bufsize = nsize & (biosize - 1); bp = nfs_getcacheblk(vp, lbn, bufsize, td); Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/kern/vfs_subr.c Mon Apr 23 13:21:28 2012 (r234605) @@ -1327,8 +1327,7 @@ flushbuflist(struct bufv *bufv, int flag * sync activity. */ int -vtruncbuf(struct vnode *vp, struct ucred *cred, struct thread *td, - off_t length, int blksize) +vtruncbuf(struct vnode *vp, struct ucred *cred, off_t length, int blksize) { struct buf *bp, *nbp; int anyfreed; Modified: head/sys/nfsclient/nfs_bio.c ============================================================================== --- head/sys/nfsclient/nfs_bio.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/nfsclient/nfs_bio.c Mon Apr 23 13:21:28 2012 (r234605) @@ -1796,7 +1796,7 @@ nfs_meta_setsize(struct vnode *vp, struc * truncation point. We may have a B_DELWRI and/or B_CACHE * buffer that now needs to be truncated. */ - error = vtruncbuf(vp, cred, td, nsize, biosize); + error = vtruncbuf(vp, cred, nsize, biosize); lbn = nsize / biosize; bufsize = nsize & (biosize - 1); bp = nfs_getcacheblk(vp, lbn, bufsize, td); Modified: head/sys/sys/vnode.h ============================================================================== --- head/sys/sys/vnode.h Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/sys/vnode.h Mon Apr 23 13:21:28 2012 (r234605) @@ -634,8 +634,8 @@ void vhold(struct vnode *); void vholdl(struct vnode *); void vinactive(struct vnode *, struct thread *); int vinvalbuf(struct vnode *vp, int save, int slpflag, int slptimeo); -int vtruncbuf(struct vnode *vp, struct ucred *cred, struct thread *td, - off_t length, int blksize); +int vtruncbuf(struct vnode *vp, struct ucred *cred, off_t length, + int blksize); void vunref(struct vnode *); void vn_printf(struct vnode *vp, const char *fmt, ...) __printflike(2,3); #define vprint(label, vp) vn_printf((vp), "%s\n", (label)) Modified: head/sys/ufs/ffs/ffs_extern.h ============================================================================== --- head/sys/ufs/ffs/ffs_extern.h Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/ufs/ffs/ffs_extern.h Mon Apr 23 13:21:28 2012 (r234605) @@ -93,7 +93,7 @@ void ffs_snapshot_unmount(struct mount * void process_deferred_inactive(struct mount *mp); void ffs_sync_snap(struct mount *, int); int ffs_syncvnode(struct vnode *vp, int waitfor, int flags); -int ffs_truncate(struct vnode *, off_t, int, struct ucred *, struct thread *); +int ffs_truncate(struct vnode *, off_t, int, struct ucred *); int ffs_update(struct vnode *, int); int ffs_valloc(struct vnode *, int, struct ucred *, struct vnode **); Modified: head/sys/ufs/ffs/ffs_inode.c ============================================================================== --- head/sys/ufs/ffs/ffs_inode.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/ufs/ffs/ffs_inode.c Mon Apr 23 13:21:28 2012 (r234605) @@ -170,12 +170,11 @@ loop: * disk blocks. */ int -ffs_truncate(vp, length, flags, cred, td) +ffs_truncate(vp, length, flags, cred) struct vnode *vp; off_t length; int flags; struct ucred *cred; - struct thread *td; { struct inode *ip; ufs2_daddr_t bn, lbn, lastblock, lastiblock[NIADDR], indir_lbn[NIADDR]; @@ -449,7 +448,7 @@ ffs_truncate(vp, length, flags, cred, td ip->i_size = osize; DIP_SET(ip, i_size, osize); - error = vtruncbuf(vp, cred, td, length, fs->fs_bsize); + error = vtruncbuf(vp, cred, length, fs->fs_bsize); if (error && (allerror == 0)) allerror = error; Modified: head/sys/ufs/ffs/ffs_snapshot.c ============================================================================== --- head/sys/ufs/ffs/ffs_snapshot.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/ufs/ffs/ffs_snapshot.c Mon Apr 23 13:21:28 2012 (r234605) @@ -850,7 +850,7 @@ out: mp->mnt_flag = (mp->mnt_flag & MNT_QUOTA) | (flag & ~MNT_QUOTA); MNT_IUNLOCK(mp); if (error) - (void) ffs_truncate(vp, (off_t)0, 0, NOCRED, td); + (void) ffs_truncate(vp, (off_t)0, 0, NOCRED); (void) ffs_syncvnode(vp, MNT_WAIT, 0); if (error) vput(vp); @@ -1989,7 +1989,7 @@ ffs_snapshot_mount(mp) reason = "non-snapshot"; } else { reason = "old format snapshot"; - (void)ffs_truncate(vp, (off_t)0, 0, NOCRED, td); + (void)ffs_truncate(vp, (off_t)0, 0, NOCRED); (void)ffs_syncvnode(vp, MNT_WAIT, 0); } printf("ffs_snapshot_mount: %s inode %d\n", Modified: head/sys/ufs/ffs/ffs_vnops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vnops.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/ufs/ffs/ffs_vnops.c Mon Apr 23 13:21:28 2012 (r234605) @@ -812,8 +812,7 @@ ffs_write(ap) if (error) { if (ioflag & IO_UNIT) { (void)ffs_truncate(vp, osize, - IO_NORMAL | (ioflag & IO_SYNC), - ap->a_cred, uio->uio_td); + IO_NORMAL | (ioflag & IO_SYNC), ap->a_cred); uio->uio_offset -= resid - uio->uio_resid; uio->uio_resid = resid; } @@ -1135,7 +1134,7 @@ ffs_extwrite(struct vnode *vp, struct ui if (error) { if (ioflag & IO_UNIT) { (void)ffs_truncate(vp, osize, - IO_EXT | (ioflag&IO_SYNC), ucred, uio->uio_td); + IO_EXT | (ioflag&IO_SYNC), ucred); uio->uio_offset -= resid - uio->uio_resid; uio->uio_resid = resid; } @@ -1326,7 +1325,7 @@ ffs_close_ea(struct vnode *vp, int commi luio.uio_td = td; /* XXX: I'm not happy about truncating to zero size */ if (ip->i_ea_len < dp->di_extsize) - error = ffs_truncate(vp, 0, IO_EXT, cred, td); + error = ffs_truncate(vp, 0, IO_EXT, cred); error = ffs_extwrite(vp, &luio, IO_EXT | IO_SYNC, cred); } if (--ip->i_ea_refs == 0) { Modified: head/sys/ufs/ufs/ufs_inode.c ============================================================================== --- head/sys/ufs/ufs/ufs_inode.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/ufs/ufs/ufs_inode.c Mon Apr 23 13:21:28 2012 (r234605) @@ -129,8 +129,7 @@ ufs_inactive(ap) if (ip->i_ump->um_fstype == UFS2) isize += ip->i_din2->di_extsize; if (ip->i_effnlink <= 0 && isize && !UFS_RDONLY(ip)) - error = UFS_TRUNCATE(vp, (off_t)0, IO_EXT | IO_NORMAL, - NOCRED, td); + error = UFS_TRUNCATE(vp, (off_t)0, IO_EXT | IO_NORMAL, NOCRED); if (ip->i_nlink <= 0 && ip->i_mode && !UFS_RDONLY(ip)) { #ifdef QUOTA if (!getinoquota(ip)) Modified: head/sys/ufs/ufs/ufs_lookup.c ============================================================================== --- head/sys/ufs/ufs/ufs_lookup.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/ufs/ufs/ufs_lookup.c Mon Apr 23 13:21:28 2012 (r234605) @@ -1133,7 +1133,7 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdir ufsdirhash_dirtrunc(dp, dp->i_endoff); #endif (void) UFS_TRUNCATE(dvp, (off_t)dp->i_endoff, - IO_NORMAL | IO_SYNC, cr, td); + IO_NORMAL | IO_SYNC, cr); if (tvp != NULL) vn_lock(tvp, LK_EXCLUSIVE | LK_RETRY); } Modified: head/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- head/sys/ufs/ufs/ufs_vnops.c Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/ufs/ufs/ufs_vnops.c Mon Apr 23 13:21:28 2012 (r234605) @@ -621,7 +621,7 @@ ufs_setattr(ap) return (0); } if ((error = UFS_TRUNCATE(vp, vap->va_size, IO_NORMAL, - cred, td)) != 0) + cred)) != 0) return (error); } if (vap->va_atime.tv_sec != VNOVAL || @@ -1567,8 +1567,7 @@ unlockout: if (tdp->i_dirhash != NULL) ufsdirhash_dirtrunc(tdp, endoff); #endif - UFS_TRUNCATE(tdvp, endoff, IO_NORMAL | IO_SYNC, tcnp->cn_cred, - td); + UFS_TRUNCATE(tdvp, endoff, IO_NORMAL | IO_SYNC, tcnp->cn_cred); } if (error == 0 && tdp->i_flag & IN_NEEDSYNC) error = VOP_FSYNC(tdvp, MNT_WAIT, td); Modified: head/sys/ufs/ufs/ufsmount.h ============================================================================== --- head/sys/ufs/ufs/ufsmount.h Mon Apr 23 13:13:46 2012 (r234604) +++ head/sys/ufs/ufs/ufsmount.h Mon Apr 23 13:21:28 2012 (r234605) @@ -100,7 +100,7 @@ struct ufsmount { int um_candelete; /* devvp supports TRIM */ int (*um_balloc)(struct vnode *, off_t, int, struct ucred *, int, struct buf **); int (*um_blkatoff)(struct vnode *, off_t, char **, struct buf **); - int (*um_truncate)(struct vnode *, off_t, int, struct ucred *, struct thread *); + int (*um_truncate)(struct vnode *, off_t, int, struct ucred *); int (*um_update)(struct vnode *, int); int (*um_valloc)(struct vnode *, int, struct ucred *, struct vnode **); int (*um_vfree)(struct vnode *, ino_t, int); @@ -111,7 +111,7 @@ struct ufsmount { #define UFS_BALLOC(aa, bb, cc, dd, ee, ff) VFSTOUFS((aa)->v_mount)->um_balloc(aa, bb, cc, dd, ee, ff) #define UFS_BLKATOFF(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_blkatoff(aa, bb, cc, dd) -#define UFS_TRUNCATE(aa, bb, cc, dd, ee) VFSTOUFS((aa)->v_mount)->um_truncate(aa, bb, cc, dd, ee) +#define UFS_TRUNCATE(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_truncate(aa, bb, cc, dd) #define UFS_UPDATE(aa, bb) VFSTOUFS((aa)->v_mount)->um_update(aa, bb) #define UFS_VALLOC(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_valloc(aa, bb, cc, dd) #define UFS_VFREE(aa, bb, cc) VFSTOUFS((aa)->v_mount)->um_vfree(aa, bb, cc)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204231321.q3NDLS5O099364>