d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Semi-backout previous fgetvp change, we need the struct file pointer

Browse Source 
to perform relative offset calculations, so use fget instead.
This commit is contained in:
Alfred Perlstein 2002-01-19 03:45:14 +00:00
parent 080c70c1b1
commit 083f6f9711
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/compat/svr4/svr4_fcntl.c
View File

@ -285,6 +285,7 @@ fd_truncate(td, fd, flp)
struct flock *flp;
{
off_t start, length;
struct file *fp;
struct vnode *vp;
struct vattr vattr;
int error, *retval;
@ -295,16 +296,18 @@ fd_truncate(td, fd, flp)
/*
* We only support truncating the file.
*/
if ((error = fgetvp(td, fd, &vp)) != 0)
if ((error = fget(td, fd, &fp)) != 0)
return (error);
if (vp->v_type == VFIFO) {
vrele(vp);
vp = (struct vnode *) fp->f_data;
if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
fdrop(fp, td);
return ESPIPE;
}
if ((error = VOP_GETATTR(vp, &vattr, td->td_proc->p_ucred, td)) != 0)
vrele(vp);
if ((error = VOP_GETATTR(vp, &vattr, td->td_proc->p_ucred, td)) != 0) {
fdrop(fp, td);
return error;
}
@ -324,12 +327,13 @@ fd_truncate(td, fd, flp)
break;
default:
vrele(vp);
fdrop(fp, td);
return EINVAL;
}
if (start + flp->l_len < length) {
/* We don't support free'ing in the middle of the file */
fdrop(fp, td);
return EINVAL;
}
@ -338,7 +342,7 @@ fd_truncate(td, fd, flp)
error = ftruncate(td, &ft);
vrele(vp);
fdrop(fp, td);
return (error);
}