diff --git a/share/man/man9/VOP_DEALLOCATE.9 b/share/man/man9/VOP_DEALLOCATE.9 --- a/share/man/man9/VOP_DEALLOCATE.9 +++ b/share/man/man9/VOP_DEALLOCATE.9 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 11, 2021 +.Dd August 11, 2021 .Dt VOP_DEALLOCATE 9 .Os .Sh NAME @@ -42,6 +42,7 @@ .Fa "off_t *offset" .Fa "off_t *len" .Fa "int flags" +.Fa "int ioflag" .Fa "struct ucred *cred" .Fc .Sh DESCRIPTION @@ -61,6 +62,8 @@ .It Fa flags The flags of this call. This should be set to 0 for now. +.It Fa ioflag +Directives and hints to be given to the file system. .It Fa cred The credentials of the caller. .El diff --git a/share/man/man9/vn_deallocate.9 b/share/man/man9/vn_deallocate.9 --- a/share/man/man9/vn_deallocate.9 +++ b/share/man/man9/vn_deallocate.9 @@ -67,7 +67,7 @@ The control flags of the operation. This should be set to 0 for now. .It Fa ioflag -The control flags of vnode locking. +Directives and hints to be given to the file system. .It Fa active_cred The user credentials of the calling thread. .It Fa file_cred @@ -76,7 +76,8 @@ .Pp The .Fn ioflag -argument may be one or more of the following flags: +argument gives directives and hints to the file system. +It may include one or more of the following flags: .Bl -tag -width IO_RANGELOCKED .It Dv IO_NODELOCKED The vnode was locked before the call. @@ -84,6 +85,10 @@ Rangelock was owned around the call. .It Dv IO_NOMACCHECK Skip MAC checking in the call. +.It Dv IO_SYNC +Do I/O synchronously. +.It Dv IO_DIRECT +Attempt to bypass buffer cache. .El .Pp .Fa *offset diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -1074,7 +1074,7 @@ static int vp_zerofill(struct vnode *vp, struct vattr *vap, off_t *offsetp, off_t *lenp, - struct ucred *cred) + int ioflag, struct ucred *cred) { int iosize; int error = 0; @@ -1110,7 +1110,7 @@ auio.uio_rw = UIO_WRITE; auio.uio_td = td; - error = VOP_WRITE(vp, &auio, 0, cred); + error = VOP_WRITE(vp, &auio, ioflag, cred); if (error != 0) { len -= xfersize - auio.uio_resid; offset += xfersize - auio.uio_resid; @@ -1175,7 +1175,7 @@ /* Fill zeroes */ xfersize = rem = omin(noff - offset, len); - error = vp_zerofill(vp, &va, &offset, &rem, cred); + error = vp_zerofill(vp, &va, &offset, &rem, ap->a_ioflag, cred); if (error) { len -= xfersize - rem; goto out; diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3509,7 +3509,7 @@ vp); #endif if (error == 0) - error = VOP_DEALLOCATE(vp, &off, &len, flags, + error = VOP_DEALLOCATE(vp, &off, &len, flags, ioflag, active_cred); if ((ioflag & IO_NODELOCKED) == 0) { @@ -3548,6 +3548,7 @@ { int error; struct vnode *vp; + int ioflag; vp = fp->f_vnode; @@ -3557,9 +3558,11 @@ if (vp->v_type != VREG) return (ENODEV); + ioflag = get_write_ioflag(fp); + switch (cmd) { case SPACECTL_DEALLOC: - error = vn_deallocate_impl(vp, offset, length, flags, 0, + error = vn_deallocate_impl(vp, offset, length, flags, ioflag, active_cred, fp->f_cred); break; default: diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -808,6 +808,7 @@ INOUT off_t *offset; INOUT off_t *len; IN int flags; + IN int ioflag; IN struct ucred *cred; };