Page MenuHomeFreeBSD
Files F154364298

D20377.id57857.diff
No OneTemporary
Actions

D20377.id57857.diff
View Options

Index: head/sys/fs/ext2fs/ext2_inode.c
===================================================================
--- head/sys/fs/ext2fs/ext2_inode.c
+++ head/sys/fs/ext2fs/ext2_inode.c
@@ -356,7 +356,7 @@
oip->i_ib[i] = oldblks[EXT2_NDADDR + i];
}
oip->i_size = osize;
- error = vtruncbuf(ovp, cred, length, (int)fs->e2fs_bsize);
+ error = vtruncbuf(ovp, length, (int)fs->e2fs_bsize);
if (error && (allerror == 0))
allerror = error;
vnode_pager_setsize(ovp, length);
@@ -530,7 +530,7 @@
}
oip->i_size = osize;
- error = vtruncbuf(ovp, cred, length, (int)fs->e2fs_bsize);
+ error = vtruncbuf(ovp, length, (int)fs->e2fs_bsize);
if (error)
return (error);
Index: head/sys/fs/fuse/fuse_io.c
===================================================================
--- head/sys/fs/fuse/fuse_io.c
+++ head/sys/fs/fuse/fuse_io.c
@@ -389,7 +389,7 @@
if (uio->uio_offset > fvdat->filesize &&
fuse_data_cache_mode != FUSE_CACHE_UC) {
- fuse_vnode_setsize(vp, cred, uio->uio_offset);
+ fuse_vnode_setsize(vp, uio->uio_offset);
fvdat->flag &= ~FN_SIZECHANGE;
}
}
@@ -462,7 +462,7 @@
if (bp != NULL) {
long save;
- err = fuse_vnode_setsize(vp, cred,
+ err = fuse_vnode_setsize(vp,
uio->uio_offset + n);
if (err) {
brelse(bp);
@@ -490,7 +490,7 @@
lbn, on, n, uio, bcount, false);
bp = getblk(vp, lbn, bcount, PCATCH, 0, 0);
if (bp && uio->uio_offset + n > fvdat->filesize) {
- err = fuse_vnode_setsize(vp, cred,
+ err = fuse_vnode_setsize(vp,
uio->uio_offset + n);
if (err) {
brelse(bp);
Index: head/sys/fs/fuse/fuse_node.h
===================================================================
--- head/sys/fs/fuse/fuse_node.h
+++ head/sys/fs/fuse/fuse_node.h
@@ -127,6 +127,6 @@
int fuse_vnode_savesize(struct vnode *vp, struct ucred *cred);
-int fuse_vnode_setsize(struct vnode *vp, struct ucred *cred, off_t newsize);
+int fuse_vnode_setsize(struct vnode *vp, off_t newsize);
#endif /* _FUSE_NODE_H_ */
Index: head/sys/fs/fuse/fuse_node.c
===================================================================
--- head/sys/fs/fuse/fuse_node.c
+++ head/sys/fs/fuse/fuse_node.c
@@ -408,7 +408,7 @@
}
int
-fuse_vnode_setsize(struct vnode *vp, struct ucred *cred, off_t newsize)
+fuse_vnode_setsize(struct vnode *vp, off_t newsize)
{
struct fuse_vnode_data *fvdat = VTOFUD(vp);
off_t oldsize;
@@ -421,7 +421,7 @@
fvdat->flag |= FN_SIZECHANGE;
if (newsize < oldsize) {
- err = vtruncbuf(vp, cred, newsize, fuse_iosize(vp));
+ err = vtruncbuf(vp, newsize, fuse_iosize(vp));
}
vnode_pager_setsize(vp, newsize);
return err;
Index: head/sys/fs/fuse/fuse_vnops.c
===================================================================
--- head/sys/fs/fuse/fuse_vnops.c
+++ head/sys/fs/fuse/fuse_vnops.c
@@ -530,7 +530,7 @@
fdi.answ)->attr.size;
if (fvdat->filesize != new_filesize) {
- fuse_vnode_setsize(vp, cred, new_filesize);
+ fuse_vnode_setsize(vp, new_filesize);
fvdat->flag &= ~FN_SIZECHANGE;
}
}
@@ -971,7 +971,7 @@
"%s!\n", __func__,
vnode_mount(vp)->mnt_stat.f_mntonname);
- (void)fuse_vnode_setsize(vp, cred, fattr->size);
+ (void)fuse_vnode_setsize(vp, fattr->size);
fvdat->flag &= ~FN_SIZECHANGE;
}
*vpp = vp;
@@ -1654,7 +1654,7 @@
out:
fdisp_destroy(&fdi);
if (!err && sizechanged) {
- fuse_vnode_setsize(vp, cred, newsize);
+ fuse_vnode_setsize(vp, newsize);
VTOFUD(vp)->flag &= ~FN_SIZECHANGE;
}
return err;
Index: head/sys/fs/msdosfs/msdosfs_denode.c
===================================================================
--- head/sys/fs/msdosfs/msdosfs_denode.c
+++ head/sys/fs/msdosfs/msdosfs_denode.c
@@ -429,7 +429,7 @@
dep->de_FileSize = length;
if (!isadir)
dep->de_flag |= DE_UPDATE | DE_MODIFIED;
- allerror = vtruncbuf(DETOV(dep), cred, length, pmp->pm_bpcluster);
+ allerror = vtruncbuf(DETOV(dep), length, pmp->pm_bpcluster);
#ifdef MSDOSFS_DEBUG
if (allerror)
printf("detrunc(): vtruncbuf error %d\n", allerror);
Index: head/sys/fs/nfsclient/nfs.h
===================================================================
--- head/sys/fs/nfsclient/nfs.h
+++ head/sys/fs/nfsclient/nfs.h
@@ -91,8 +91,7 @@
/*
* Function prototypes.
*/
-int ncl_meta_setsize(struct vnode *, struct ucred *, struct thread *,
- u_quad_t);
+int ncl_meta_setsize(struct vnode *, struct thread *, u_quad_t);
void ncl_doio_directwrite(struct buf *);
int ncl_bioread(struct vnode *, struct uio *, int, struct ucred *);
int ncl_biowrite(struct vnode *, struct uio *, int, struct ucred *);
Index: head/sys/fs/nfsclient/nfs_clbio.c
===================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c
+++ head/sys/fs/nfsclient/nfs_clbio.c
@@ -1832,7 +1832,7 @@
*/
int
-ncl_meta_setsize(struct vnode *vp, struct ucred *cred, struct thread *td, u_quad_t nsize)
+ncl_meta_setsize(struct vnode *vp, struct thread *td, u_quad_t nsize)
{
struct nfsnode *np = VTONFS(vp);
u_quad_t tsize;
@@ -1854,7 +1854,7 @@
* truncation point. We may have a B_DELWRI and/or B_CACHE
* buffer that now needs to be truncated.
*/
- error = vtruncbuf(vp, cred, nsize, biosize);
+ error = vtruncbuf(vp, nsize, biosize);
lbn = nsize / biosize;
bufsize = nsize - (lbn * biosize);
bp = nfs_getcacheblk(vp, lbn, bufsize, td);
Index: head/sys/fs/nfsclient/nfs_clvnops.c
===================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c
+++ head/sys/fs/nfsclient/nfs_clvnops.c
@@ -979,8 +979,7 @@
mtx_lock(&np->n_mtx);
tsize = np->n_size;
mtx_unlock(&np->n_mtx);
- error = ncl_meta_setsize(vp, ap->a_cred, td,
- vap->va_size);
+ error = ncl_meta_setsize(vp, td, vap->va_size);
mtx_lock(&np->n_mtx);
if (np->n_flag & NMODIFIED) {
tsize = np->n_size;
Index: head/sys/kern/vfs_subr.c
===================================================================
--- head/sys/kern/vfs_subr.c
+++ head/sys/kern/vfs_subr.c
@@ -1863,15 +1863,15 @@
* sync activity.
*/
int
-vtruncbuf(struct vnode *vp, struct ucred *cred, off_t length, int blksize)
+vtruncbuf(struct vnode *vp, off_t length, int blksize)
{
struct buf *bp, *nbp;
int anyfreed;
daddr_t trunclbn;
struct bufobj *bo;
- CTR5(KTR_VFS, "%s: vp %p with cred %p and block %d:%ju", __func__,
- vp, cred, blksize, (uintmax_t)length);
+ CTR4(KTR_VFS, "%s: vp %p with block %d:%ju", __func__,
+ vp, blksize, (uintmax_t)length);
/*
* Round up to the *next* lbn.
Index: head/sys/sys/vnode.h
===================================================================
--- head/sys/sys/vnode.h
+++ head/sys/sys/vnode.h
@@ -658,8 +658,7 @@
void _vhold(struct vnode *, bool);
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, off_t length,
- int blksize);
+int vtruncbuf(struct vnode *vp, off_t length, int blksize);
void vunref(struct vnode *);
void vn_printf(struct vnode *vp, const char *fmt, ...) __printflike(2,3);
int vrecycle(struct vnode *vp);
Index: head/sys/ufs/ffs/ffs_inode.c
===================================================================
--- head/sys/ufs/ffs/ffs_inode.c
+++ head/sys/ufs/ffs/ffs_inode.c
@@ -509,7 +509,7 @@
ip->i_size = osize;
DIP_SET(ip, i_size, osize);
- error = vtruncbuf(vp, cred, length, fs->fs_bsize);
+ error = vtruncbuf(vp, length, fs->fs_bsize);
if (error && (allerror == 0))
allerror = error;

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 29, 3:15 AM (4 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32320914
Default Alt Text
D20377.id57857.diff (7 KB)

Event Timeline