summaryrefslogtreecommitdiffstats
path: root/sys/nfsclient
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2004-09-15 21:49:22 +0000
committerphk <phk@FreeBSD.org>2004-09-15 21:49:22 +0000
commit02df7323ee036c2be0e7631cf9409b60dfd8c639 (patch)
treed92ca2a67056cb64f883fc30e23e54e07c558b3a /sys/nfsclient
parent43f0dbec3ceba881973c7fa78183a30a555ba716 (diff)
downloadFreeBSD-src-02df7323ee036c2be0e7631cf9409b60dfd8c639.zip
FreeBSD-src-02df7323ee036c2be0e7631cf9409b60dfd8c639.tar.gz
Remove unused B_WRITEINPROG flag
Diffstat (limited to 'sys/nfsclient')
-rw-r--r--sys/nfsclient/nfs_bio.c5
-rw-r--r--sys/nfsclient/nfs_vnops.c11
2 files changed, 3 insertions, 13 deletions
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 0a7fbb5..d05180d 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -1271,7 +1271,6 @@ again:
if (bp->b_rcred == NOCRED && cred != NOCRED)
bp->b_rcred = crhold(cred);
} else {
- bp->b_flags |= B_WRITEINPROG;
if (bp->b_wcred == NOCRED && cred != NOCRED)
bp->b_wcred = crhold(cred);
}
@@ -1405,11 +1404,9 @@ nfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td)
off_t off;
off = ((u_quad_t)bp->b_blkno) * DEV_BSIZE + bp->b_dirtyoff;
- bp->b_flags |= B_WRITEINPROG;
retv = (nmp->nm_rpcops->nr_commit)(
bp->b_vp, off, bp->b_dirtyend-bp->b_dirtyoff,
bp->b_wcred, td);
- bp->b_flags &= ~B_WRITEINPROG;
if (retv == 0) {
bp->b_dirtyoff = bp->b_dirtyend = 0;
bp->b_flags &= ~(B_NEEDCOMMIT | B_CLUSTEROK);
@@ -1443,7 +1440,6 @@ nfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td)
else
iomode = NFSV3WRITE_FILESYNC;
- bp->b_flags |= B_WRITEINPROG;
error = (nmp->nm_rpcops->nr_writerpc)(vp, uiop, cr, &iomode, &must_commit);
/*
@@ -1467,7 +1463,6 @@ nfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td)
} else {
bp->b_flags &= ~(B_NEEDCOMMIT | B_CLUSTEROK);
}
- bp->b_flags &= ~B_WRITEINPROG;
/*
* For an interrupted write, the buffer is still valid
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 9390cd6..ed0349e 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -2708,7 +2708,6 @@ again:
wcred = bp->b_wcred;
else if (wcred != bp->b_wcred)
wcred = NOCRED;
- bp->b_flags |= B_WRITEINPROG;
vfs_busy_pages(bp, 1);
VI_LOCK(vp);
@@ -2773,7 +2772,7 @@ again:
*/
for (i = 0; i < bvecpos; i++) {
bp = bvec[i];
- bp->b_flags &= ~(B_NEEDCOMMIT | B_WRITEINPROG | B_CLUSTEROK);
+ bp->b_flags &= ~(B_NEEDCOMMIT | B_CLUSTEROK);
if (retv) {
/*
* Error, leave B_DELWRI intact
@@ -2843,7 +2842,7 @@ loop:
if (passone || !commit)
bp->b_flags |= B_ASYNC;
else
- bp->b_flags |= B_ASYNC | B_WRITEINPROG;
+ bp->b_flags |= B_ASYNC;
splx(s);
bwrite(bp);
goto loop;
@@ -2921,12 +2920,10 @@ nfs_print(struct vop_print_args *ap)
/*
* This is the "real" nfs::bwrite(struct buf*).
- * B_WRITEINPROG isn't set unless the force flag is one and it
- * handles the B_NEEDCOMMIT flag.
* We set B_CACHE if this is a VMIO buffer.
*/
int
-nfs_writebp(struct buf *bp, int force, struct thread *td)
+nfs_writebp(struct buf *bp, int force __unused, struct thread *td)
{
int s;
int oldflags = bp->b_flags;
@@ -2967,8 +2964,6 @@ nfs_writebp(struct buf *bp, int force, struct thread *td)
*/
vfs_busy_pages(bp, 1);
- if (force)
- bp->b_flags |= B_WRITEINPROG;
BUF_KERNPROC(bp);
bp->b_iooffset = dbtob(bp->b_blkno);
VOP_STRATEGY(bp->b_vp, bp);
OpenPOWER on IntegriCloud