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

fusefs: remove some stuff that was copy/pasted from nfsclient

Browse Source 
fusefs's I/O methods were originally copy/pasted from nfsclient.  This
commit removes some irrelevant parts, like stuff involving B_NEEDCOMMIT.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Alan Somers 2019-06-06 20:35:41 +00:00
parent 2d6bf515df
commit ddc51e453e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/fuse2/; revision=348758
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/fs/fuse/fuse_io.c
View File

@ -567,7 +567,7 @@ fuse_write_biobackend(struct vnode *vp, struct uio *uio,
const int biosize = fuse_iosize(vp);
KASSERT(uio->uio_rw == UIO_WRITE, ("ncl_write mode"));
KASSERT(uio->uio_rw == UIO_WRITE, ("fuse_write_biobackend mode"));
if (vp->v_type != VREG)
return (EIO);
if (uio->uio_offset < 0)
@ -585,14 +585,6 @@ fuse_write_biobackend(struct vnode *vp, struct uio *uio,
if (vn_rlimit_fsize(vp, uio, uio->uio_td))
return (EFBIG);
/*
* Find all of this file's B_NEEDCOMMIT buffers. If our writes
* would exceed the local maximum per-file write commit size when
* combined with those, we must decide whether to flush,
* go synchronous, or return err. We don't bother checking
* IO_UNIT -- we just make all writes atomic anyway, as there's
* no point optimizing for something that really won't ever happen.
*/
do {
bool direct_append, extending;
@ -741,14 +733,6 @@ fuse_write_biobackend(struct vnode *vp, struct uio *uio,
}
err = uiomove((char *)bp->b_data + on, n, uio);
/*
* Since this block is being modified, it must be written
* again and not just committed. Since write clustering does
* not work for the stage 1 data write, only the stage 2
* commit rpc, we have to clear B_CLUSTEROK as well.
*/
bp->b_flags &= ~(B_NEEDCOMMIT | B_CLUSTEROK);
if (err) {
bp->b_ioflags |= BIO_ERROR;
bp->b_error = err;
@ -859,13 +843,6 @@ fuse_io_strategy(struct vnode *vp, struct buf *bp)
bp->b_error = error;
}
} else {
/*
* If we only need to commit, try to commit
*/
if (bp->b_flags & B_NEEDCOMMIT) {
SDT_PROBE2(fusefs, , io, trace, 1,
"write: B_NEEDCOMMIT flags set");
}
/*
* Setup for actual write
*/
@ -892,9 +869,7 @@ fuse_io_strategy(struct vnode *vp, struct buf *bp)
error = fuse_write_directbackend(vp, uiop, cred, fufh,
filesize, 0, false);
if (error == EINTR || error == ETIMEDOUT
|| (!error && (bp->b_flags & B_NEEDCOMMIT))) {
if (error == EINTR || error == ETIMEDOUT) {
bp->b_flags &= ~(B_INVAL | B_NOCACHE);
if ((bp->b_flags & B_PAGING) == 0) {
bdirty(bp);