Module Name: src
Committed By: hannken
Date: Wed Mar 1 10:42:46 UTC 2017
Modified Files:
src/sys/ufs/ffs: ffs_alloc.c ffs_snapshot.c ffs_vfsops.c ffs_vnops.c
src/sys/ufs/ufs: ufs_bmap.c ufs_inode.c ufs_quota2.c ufs_readwrite.c
ufs_vnops.c ufs_wapbl.c
Log Message:
Remove now redundant calls to fstrans_start()/fstrans_done().
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/ufs/ffs/ffs_alloc.c
cvs rdiff -u -r1.145 -r1.146 src/sys/ufs/ffs/ffs_snapshot.c
cvs rdiff -u -r1.346 -r1.347 src/sys/ufs/ffs/ffs_vfsops.c
cvs rdiff -u -r1.125 -r1.126 src/sys/ufs/ffs/ffs_vnops.c
cvs rdiff -u -r1.50 -r1.51 src/sys/ufs/ufs/ufs_bmap.c
cvs rdiff -u -r1.98 -r1.99 src/sys/ufs/ufs/ufs_inode.c
cvs rdiff -u -r1.41 -r1.42 src/sys/ufs/ufs/ufs_quota2.c
cvs rdiff -u -r1.120 -r1.121 src/sys/ufs/ufs/ufs_readwrite.c
cvs rdiff -u -r1.234 -r1.235 src/sys/ufs/ufs/ufs_vnops.c
cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/ufs/ufs_wapbl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.154 src/sys/ufs/ffs/ffs_alloc.c:1.155
--- src/sys/ufs/ffs/ffs_alloc.c:1.154 Sun Oct 30 15:01:46 2016
+++ src/sys/ufs/ffs/ffs_alloc.c Wed Mar 1 10:42:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_alloc.c,v 1.154 2016/10/30 15:01:46 christos Exp $ */
+/* $NetBSD: ffs_alloc.c,v 1.155 2017/03/01 10:42:45 hannken Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.154 2016/10/30 15:01:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.155 2017/03/01 10:42:45 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -82,7 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/cprng.h>
-#include <sys/fstrans.h>
#include <sys/kauth.h>
#include <sys/kernel.h>
#include <sys/mount.h>
Index: src/sys/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.145 src/sys/ufs/ffs/ffs_snapshot.c:1.146
--- src/sys/ufs/ffs/ffs_snapshot.c:1.145 Fri Feb 17 08:30:00 2017
+++ src/sys/ufs/ffs/ffs_snapshot.c Wed Mar 1 10:42:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.145 2017/02/17 08:30:00 hannken Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.146 2017/03/01 10:42:45 hannken Exp $ */
/*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.145 2017/02/17 08:30:00 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.146 2017/03/01 10:42:45 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -2086,7 +2086,6 @@ ffs_snapshot_read(struct vnode *vp, stru
long size, xfersize, blkoffset;
int error;
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
mutex_enter(&si->si_snaplock);
if (ioflag & IO_ALTSEMANTICS)
@@ -2139,7 +2138,6 @@ ffs_snapshot_read(struct vnode *vp, stru
brelse(bp, BC_AGE);
mutex_exit(&si->si_snaplock);
- fstrans_done(vp->v_mount);
return error;
}
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.346 src/sys/ufs/ffs/ffs_vfsops.c:1.347
--- src/sys/ufs/ffs/ffs_vfsops.c:1.346 Wed Feb 22 09:50:13 2017
+++ src/sys/ufs/ffs/ffs_vfsops.c Wed Mar 1 10:42:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.346 2017/02/22 09:50:13 hannken Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.347 2017/03/01 10:42:45 hannken Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.346 2017/02/22 09:50:13 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.347 2017/03/01 10:42:45 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -92,7 +92,6 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c
#include <sys/conf.h>
#include <sys/kauth.h>
#include <sys/wapbl.h>
-#include <sys/fstrans.h>
#include <sys/module.h>
#include <miscfs/genfs/genfs.h>
@@ -1832,7 +1831,6 @@ ffs_statvfs(struct mount *mp, struct sta
struct ffs_sync_ctx {
int waitfor;
- bool is_suspending;
};
static bool
@@ -1869,9 +1867,6 @@ ffs_sync_selector(void *cl, struct vnode
UVM_OBJ_IS_CLEAN(&vp->v_uobj))))
return false;
- if (vp->v_type == VBLK && c->is_suspending)
- return false;
-
return true;
}
@@ -1890,7 +1885,6 @@ ffs_sync(struct mount *mp, int waitfor,
struct fs *fs;
struct vnode_iterator *marker;
int error, allerror = 0;
- bool is_suspending;
struct ffs_sync_ctx ctx;
fs = ump->um_fs;
@@ -1898,15 +1892,12 @@ ffs_sync(struct mount *mp, int waitfor,
panic("%s: rofs mod, fs=%s", __func__, fs->fs_fsmnt);
}
- fstrans_start(mp, FSTRANS_SHARED);
- is_suspending = (fstrans_getstate(mp) == FSTRANS_SUSPENDING);
/*
* Write back each (modified) inode.
*/
vfs_vnode_iterator_init(mp, &marker);
ctx.waitfor = waitfor;
- ctx.is_suspending = is_suspending;
while ((vp = vfs_vnode_iterator_next(marker, ffs_sync_selector, &ctx)))
{
error = vn_lock(vp,
@@ -1971,7 +1962,6 @@ ffs_sync(struct mount *mp, int waitfor,
}
#endif
- fstrans_done(mp);
return (allerror);
}
Index: src/sys/ufs/ffs/ffs_vnops.c
diff -u src/sys/ufs/ffs/ffs_vnops.c:1.125 src/sys/ufs/ffs/ffs_vnops.c:1.126
--- src/sys/ufs/ffs/ffs_vnops.c:1.125 Fri Jul 25 08:20:53 2014
+++ src/sys/ufs/ffs/ffs_vnops.c Wed Mar 1 10:42:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vnops.c,v 1.125 2014/07/25 08:20:53 dholland Exp $ */
+/* $NetBSD: ffs_vnops.c,v 1.126 2017/03/01 10:42:45 hannken Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.125 2014/07/25 08:20:53 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.126 2017/03/01 10:42:45 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -83,7 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,
#include <sys/signalvar.h>
#include <sys/kauth.h>
#include <sys/wapbl.h>
-#include <sys/fstrans.h>
#include <miscfs/fifofs/fifo.h>
#include <miscfs/genfs/genfs.h>
@@ -291,8 +290,6 @@ ffs_spec_fsync(void *v)
vp = ap->a_vp;
mp = vp->v_mount;
- fstrans_start(mp, FSTRANS_LAZY);
-
error = spec_fsync(v);
if (error)
goto out;
@@ -322,7 +319,6 @@ ffs_spec_fsync(void *v)
error = ffs_update(vp, NULL, NULL, uflags);
out:
- fstrans_done(mp);
return error;
}
@@ -348,7 +344,6 @@ ffs_fsync(void *v)
vp = ap->a_vp;
mp = vp->v_mount;
- fstrans_start(mp, FSTRANS_LAZY);
if ((ap->a_offlo == 0 && ap->a_offhi == 0) || (vp->v_type != VREG)) {
error = ffs_full_fsync(vp, ap->a_flags);
goto out;
@@ -381,7 +376,6 @@ ffs_fsync(void *v)
* VFS_SYNC().
*/
if ((ap->a_flags & (FSYNC_DATAONLY | FSYNC_LAZY)) != 0) {
- fstrans_done(mp);
return 0;
}
error = 0;
@@ -390,7 +384,6 @@ ffs_fsync(void *v)
IN_MODIFIED | IN_ACCESSED)) {
error = UFS_WAPBL_BEGIN(mp);
if (error) {
- fstrans_done(mp);
return error;
}
error = ffs_update(vp, NULL, NULL, UPDATE_CLOSE |
@@ -398,11 +391,9 @@ ffs_fsync(void *v)
UFS_WAPBL_END(mp);
}
if (error || (ap->a_flags & FSYNC_NOLOG) != 0) {
- fstrans_done(mp);
return error;
}
error = wapbl_flush(mp->mnt_wapbl, 0);
- fstrans_done(mp);
return error;
}
#endif /* WAPBL */
@@ -449,7 +440,6 @@ ffs_fsync(void *v)
}
out:
- fstrans_done(mp);
return error;
}
@@ -482,8 +472,6 @@ ffs_full_fsync(struct vnode *vp, int fla
pflags |= PGO_LAZY;
if ((flags & FSYNC_WAIT))
pflags |= PGO_SYNCIO;
- if (fstrans_getstate(mp) == FSTRANS_SUSPENDING)
- pflags |= PGO_FREE;
mutex_enter(vp->v_interlock);
error = VOP_PUTPAGES(vp, 0, 0, pflags);
if (error)
@@ -562,7 +550,6 @@ ffs_reclaim(void *v)
void *data;
int error;
- fstrans_start(mp, FSTRANS_LAZY);
/*
* The inode must be freed and updated before being removed
* from its hash chain. Other threads trying to gain a hold
@@ -570,7 +557,6 @@ ffs_reclaim(void *v)
*/
error = UFS_WAPBL_BEGIN(mp);
if (error) {
- fstrans_done(mp);
return error;
}
if (ip->i_nlink <= 0 && ip->i_omode != 0 &&
@@ -578,7 +564,6 @@ ffs_reclaim(void *v)
ffs_vfree(vp, ip->i_number, ip->i_omode);
UFS_WAPBL_END(mp);
if ((error = ufs_reclaim(vp)) != 0) {
- fstrans_done(mp);
return (error);
}
if (ip->i_din.ffs1_din != NULL) {
@@ -601,7 +586,6 @@ ffs_reclaim(void *v)
* XXX a separate pool for MFS inodes?
*/
pool_cache_put(ffs_inode_cache, data);
- fstrans_done(mp);
return (0);
}
@@ -685,9 +669,7 @@ ffs_getextattr(void *v)
#ifdef UFS_EXTATTR
int error;
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
error = ufs_getextattr(ap);
- fstrans_done(vp->v_mount);
return error;
#else
return (EOPNOTSUPP);
@@ -717,9 +699,7 @@ ffs_setextattr(void *v)
#ifdef UFS_EXTATTR
int error;
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
error = ufs_setextattr(ap);
- fstrans_done(vp->v_mount);
return error;
#else
return (EOPNOTSUPP);
@@ -746,12 +726,9 @@ ffs_listextattr(void *v)
if (fs->fs_magic == FS_UFS1_MAGIC) {
#ifdef UFS_EXTATTR
- struct vnode *vp = ap->a_vp;
int error;
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
error = ufs_listextattr(ap);
- fstrans_done(vp->v_mount);
return error;
#else
return (EOPNOTSUPP);
@@ -779,9 +756,7 @@ ffs_deleteextattr(void *v)
#ifdef UFS_EXTATTR
int error;
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
error = ufs_deleteextattr(ap);
- fstrans_done(vp->v_mount);
return error;
#else
return (EOPNOTSUPP);
Index: src/sys/ufs/ufs/ufs_bmap.c
diff -u src/sys/ufs/ufs/ufs_bmap.c:1.50 src/sys/ufs/ufs/ufs_bmap.c:1.51
--- src/sys/ufs/ufs/ufs_bmap.c:1.50 Tue Jan 22 09:39:18 2013
+++ src/sys/ufs/ufs/ufs_bmap.c Wed Mar 1 10:42:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_bmap.c,v 1.50 2013/01/22 09:39:18 dholland Exp $ */
+/* $NetBSD: ufs_bmap.c,v 1.51 2017/03/01 10:42:45 hannken Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_bmap.c,v 1.50 2013/01/22 09:39:18 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_bmap.c,v 1.51 2017/03/01 10:42:45 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_bmap.c,v
#include <sys/mount.h>
#include <sys/resourcevar.h>
#include <sys/trace.h>
-#include <sys/fstrans.h>
#include <miscfs/specfs/specdev.h>
@@ -93,10 +92,8 @@ ufs_bmap(void *v)
if (ap->a_bnp == NULL)
return (0);
- fstrans_start(ap->a_vp->v_mount, FSTRANS_SHARED);
error = ufs_bmaparray(ap->a_vp, ap->a_bn, ap->a_bnp, NULL, NULL,
ap->a_runp, ufs_issequential);
- fstrans_done(ap->a_vp->v_mount);
return error;
}
Index: src/sys/ufs/ufs/ufs_inode.c
diff -u src/sys/ufs/ufs/ufs_inode.c:1.98 src/sys/ufs/ufs/ufs_inode.c:1.99
--- src/sys/ufs/ufs/ufs_inode.c:1.98 Wed Jan 4 10:04:17 2017
+++ src/sys/ufs/ufs/ufs_inode.c Wed Mar 1 10:42:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_inode.c,v 1.98 2017/01/04 10:04:17 hannken Exp $ */
+/* $NetBSD: ufs_inode.c,v 1.99 2017/03/01 10:42:45 hannken Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.98 2017/01/04 10:04:17 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.99 2017/03/01 10:42:45 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,
#include <sys/namei.h>
#include <sys/kauth.h>
#include <sys/wapbl.h>
-#include <sys/fstrans.h>
#include <sys/kmem.h>
#include <ufs/ufs/inode.h>
@@ -91,8 +90,6 @@ ufs_inactive(void *v)
UFS_WAPBL_JUNLOCK_ASSERT(mp);
- fstrans_start(mp, FSTRANS_LAZY);
-
/*
* Ignore inodes related to stale file handles.
*/
@@ -154,7 +151,6 @@ out:
*/
*ap->a_recycle = (ip->i_mode == 0);
VOP_UNLOCK(vp);
- fstrans_done(mp);
return (allerror);
}
Index: src/sys/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.41 src/sys/ufs/ufs/ufs_quota2.c:1.42
--- src/sys/ufs/ufs/ufs_quota2.c:1.41 Sun Nov 20 21:21:26 2016
+++ src/sys/ufs/ufs/ufs_quota2.c Wed Mar 1 10:42:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.41 2016/11/20 21:21:26 riastradh Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.42 2017/03/01 10:42:45 hannken Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.41 2016/11/20 21:21:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.42 2017/03/01 10:42:45 hannken Exp $");
#include <sys/buf.h>
#include <sys/param.h>
@@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/fstrans.h>
#include <sys/kauth.h>
#include <sys/wapbl.h>
#include <sys/quota.h>
Index: src/sys/ufs/ufs/ufs_readwrite.c
diff -u src/sys/ufs/ufs/ufs_readwrite.c:1.120 src/sys/ufs/ufs/ufs_readwrite.c:1.121
--- src/sys/ufs/ufs/ufs_readwrite.c:1.120 Sun Apr 12 22:48:38 2015
+++ src/sys/ufs/ufs/ufs_readwrite.c Wed Mar 1 10:42:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_readwrite.c,v 1.120 2015/04/12 22:48:38 riastradh Exp $ */
+/* $NetBSD: ufs_readwrite.c,v 1.121 2017/03/01 10:42:45 hannken Exp $ */
/*-
* Copyright (c) 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.120 2015/04/12 22:48:38 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.121 2017/03/01 10:42:45 hannken Exp $");
#ifdef LFS_READWRITE
#define FS struct lfs
@@ -121,8 +121,6 @@ READ(void *v)
return ffs_snapshot_read(vp, uio, ioflag);
#endif /* !LFS_READWRITE */
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
-
if (uio->uio_offset >= ip->i_size)
goto out;
@@ -143,7 +141,6 @@ READ(void *v)
out:
error = ufs_post_read_update(vp, ap->a_ioflag, error);
- fstrans_done(vp->v_mount);
return (error);
}
@@ -184,8 +181,6 @@ BUFRD(struct vnode *vp, struct uio *uio,
KASSERT(!ISSET(ip->i_flags, (SF_SNAPSHOT | SF_SNAPINVAL)));
#endif
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
-
if (uio->uio_offset >= ip->i_size)
goto out;
@@ -233,7 +228,6 @@ BUFRD(struct vnode *vp, struct uio *uio,
out:
error = ufs_post_read_update(vp, ioflag, error);
- fstrans_done(vp->v_mount);
return (error);
}
@@ -317,8 +311,6 @@ WRITE(void *v)
if (uio->uio_resid == 0)
return (0);
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
-
flags = ioflag & IO_SYNC ? B_SYNC : 0;
async = vp->v_mount->mnt_flag & MNT_ASYNC;
origoff = uio->uio_offset;
@@ -357,7 +349,6 @@ WRITE(void *v)
*/
error = UFS_WAPBL_BEGIN(vp->v_mount);
if (error) {
- fstrans_done(vp->v_mount);
return error;
}
@@ -502,7 +493,6 @@ out:
error = ufs_post_write_update(vp, uio, ioflag, cred, osize, resid,
extended, error);
UFS_WAPBL_END(vp->v_mount);
- fstrans_done(vp->v_mount);
return (error);
}
@@ -551,8 +541,6 @@ BUFWR(struct vnode *vp, struct uio *uio,
if (uio->uio_resid == 0)
return 0;
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
-
flags = ioflag & IO_SYNC ? B_SYNC : 0;
resid = uio->uio_resid;
osize = ip->i_size;
@@ -634,7 +622,6 @@ BUFWR(struct vnode *vp, struct uio *uio,
error = ufs_post_write_update(vp, uio, ioflag, cred, osize, resid,
extended, error);
- fstrans_done(vp->v_mount);
return (error);
}
Index: src/sys/ufs/ufs/ufs_vnops.c
diff -u src/sys/ufs/ufs/ufs_vnops.c:1.234 src/sys/ufs/ufs/ufs_vnops.c:1.235
--- src/sys/ufs/ufs/ufs_vnops.c:1.234 Wed Nov 9 04:12:55 2016
+++ src/sys/ufs/ufs/ufs_vnops.c Wed Mar 1 10:42:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_vnops.c,v 1.234 2016/11/09 04:12:55 dholland Exp $ */
+/* $NetBSD: ufs_vnops.c,v 1.235 2017/03/01 10:42:45 hannken Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.234 2016/11/09 04:12:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.235 2017/03/01 10:42:45 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -90,7 +90,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,
#include <sys/lockf.h>
#include <sys/kauth.h>
#include <sys/wapbl.h>
-#include <sys/fstrans.h>
#include <miscfs/specfs/specdev.h>
#include <miscfs/fifofs/fifo.h>
@@ -154,14 +153,11 @@ ufs_create(void *v)
* UFS_WAPBL_BEGIN(dvp->v_mount) performed by successful
* ufs_makeinode
*/
- fstrans_start(dvp->v_mount, FSTRANS_SHARED);
error = ufs_makeinode(ap->a_vap, dvp, ulr, ap->a_vpp, ap->a_cnp);
if (error) {
- fstrans_done(dvp->v_mount);
return (error);
}
UFS_WAPBL_END(dvp->v_mount);
- fstrans_done(dvp->v_mount);
VN_KNOTE(dvp, NOTE_WRITE);
VOP_UNLOCK(*ap->a_vpp);
return (0);
@@ -197,7 +193,6 @@ ufs_mknod(void *v)
* UFS_WAPBL_BEGIN(dvp->v_mount) performed by successful
* ufs_makeinode
*/
- fstrans_start(ap->a_dvp->v_mount, FSTRANS_SHARED);
if ((error = ufs_makeinode(vap, ap->a_dvp, ulr, vpp, ap->a_cnp)) != 0)
goto out;
VN_KNOTE(ap->a_dvp, NOTE_WRITE);
@@ -207,7 +202,6 @@ ufs_mknod(void *v)
UFS_WAPBL_END(ap->a_dvp->v_mount);
VOP_UNLOCK(*vpp);
out:
- fstrans_done(ap->a_dvp->v_mount);
if (error != 0) {
*vpp = NULL;
return (error);
@@ -256,10 +250,8 @@ ufs_close(void *v)
struct vnode *vp;
vp = ap->a_vp;
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
if (vp->v_usecount > 1)
UFS_ITIMES(vp, NULL, NULL, NULL);
- fstrans_done(vp->v_mount);
return (0);
}
@@ -284,9 +276,7 @@ ufs_check_possible(struct vnode *vp, str
if (vp->v_mount->mnt_flag & MNT_RDONLY)
return (EROFS);
#if defined(QUOTA) || defined(QUOTA2)
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
error = chkdq(ip, 0, cred, 0);
- fstrans_done(vp->v_mount);
if (error != 0)
return error;
#endif
@@ -364,7 +354,6 @@ ufs_getattr(void *v)
vp = ap->a_vp;
ip = VTOI(vp);
vap = ap->a_vap;
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
UFS_ITIMES(vp, NULL, NULL, NULL);
/*
@@ -430,7 +419,6 @@ ufs_getattr(void *v)
vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize;
vap->va_type = vp->v_type;
vap->va_filerev = ip->i_modrev;
- fstrans_done(vp->v_mount);
return (0);
}
@@ -474,8 +462,6 @@ ufs_setattr(void *v)
UFS_WAPBL_JUNLOCK_ASSERT(vp->v_mount);
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
-
if (vap->va_flags != VNOVAL) {
if (vp->v_mount->mnt_flag & MNT_RDONLY) {
error = EROFS;
@@ -635,7 +621,6 @@ ufs_setattr(void *v)
}
VN_KNOTE(vp, NOTE_ATTRIB);
out:
- fstrans_done(vp->v_mount);
return (error);
}
@@ -658,13 +643,11 @@ ufs_chmod(struct vnode *vp, int mode, ka
if (error)
return (error);
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
ip->i_mode &= ~ALLPERMS;
ip->i_mode |= (mode & ALLPERMS);
ip->i_flag |= IN_CHANGE;
DIP_ASSIGN(ip, mode, ip->i_mode);
UFS_WAPBL_UPDATE(vp, NULL, NULL, 0);
- fstrans_done(vp->v_mount);
return (0);
}
@@ -696,7 +679,6 @@ ufs_chown(struct vnode *vp, uid_t uid, g
if (error)
return (error);
- fstrans_start(vp->v_mount, FSTRANS_SHARED);
#if defined(QUOTA) || defined(QUOTA2)
ogid = ip->i_gid;
ouid = ip->i_uid;
@@ -721,13 +703,11 @@ ufs_chown(struct vnode *vp, uid_t uid, g
DIP_ASSIGN(ip, uid, ouid);
(void) chkdq(ip, change, cred, FORCE);
(void) chkiq(ip, 1, cred, FORCE);
- fstrans_done(vp->v_mount);
return (error);
good:
#endif /* QUOTA || QUOTA2 */
ip->i_flag |= IN_CHANGE;
UFS_WAPBL_UPDATE(vp, NULL, NULL, 0);
- fstrans_done(vp->v_mount);
return (0);
}
@@ -755,7 +735,6 @@ ufs_remove(void *v)
ulr = &VTOI(dvp)->i_crap;
UFS_CHECK_CRAPCOUNTER(VTOI(dvp));
- fstrans_start(mp, FSTRANS_SHARED);
if (vp->v_type == VDIR || (ip->i_flags & (IMMUTABLE | APPEND)) ||
(VTOI(dvp)->i_flags & APPEND))
error = EPERM;
@@ -774,7 +753,6 @@ ufs_remove(void *v)
else
vput(vp);
vput(dvp);
- fstrans_done(mp);
return (error);
}
@@ -806,7 +784,6 @@ ufs_link(void *v)
ulr = &VTOI(dvp)->i_crap;
UFS_CHECK_CRAPCOUNTER(VTOI(dvp));
- fstrans_start(mp, FSTRANS_SHARED);
error = vn_lock(vp, LK_EXCLUSIVE);
if (error) {
VOP_ABORTOP(dvp, cnp);
@@ -850,7 +827,6 @@ ufs_link(void *v)
out2:
VN_KNOTE(vp, NOTE_LINK);
VN_KNOTE(dvp, NOTE_WRITE);
- fstrans_done(mp);
return (error);
}
@@ -886,7 +862,6 @@ ufs_whiteout(void *v)
case CREATE:
/* create a new directory whiteout */
- fstrans_start(dvp->v_mount, FSTRANS_SHARED);
error = UFS_WAPBL_BEGIN(dvp->v_mount);
if (error)
break;
@@ -908,7 +883,6 @@ ufs_whiteout(void *v)
case DELETE:
/* remove an existing directory whiteout */
- fstrans_start(dvp->v_mount, FSTRANS_SHARED);
error = UFS_WAPBL_BEGIN(dvp->v_mount);
if (error)
break;
@@ -925,7 +899,6 @@ ufs_whiteout(void *v)
/* NOTREACHED */
}
UFS_WAPBL_END(dvp->v_mount);
- fstrans_done(dvp->v_mount);
return (error);
}
@@ -950,8 +923,6 @@ ufs_mkdir(void *v)
int dirblksiz = ump->um_dirblksiz;
struct ufs_lookup_results *ulr;
- fstrans_start(dvp->v_mount, FSTRANS_SHARED);
-
/* XXX should handle this material another way */
ulr = &dp->i_crap;
UFS_CHECK_CRAPCOUNTER(dp);
@@ -1072,7 +1043,6 @@ ufs_mkdir(void *v)
vput(tvp);
}
out:
- fstrans_done(dvp->v_mount);
return (error);
}
@@ -1112,8 +1082,6 @@ ufs_rmdir(void *v)
return (EINVAL);
}
- fstrans_start(dvp->v_mount, FSTRANS_SHARED);
-
/*
* Do not remove a directory that is in the process of being renamed.
* Verify that the directory is empty (and valid). (Rmdir ".." won't
@@ -1172,7 +1140,6 @@ ufs_rmdir(void *v)
out:
VN_KNOTE(vp, NOTE_DELETE);
vput(vp);
- fstrans_done(dvp->v_mount);
vput(dvp);
return (error);
}
@@ -1205,7 +1172,6 @@ ufs_symlink(void *v)
* UFS_WAPBL_BEGIN(dvp->v_mount) performed by successful
* ufs_makeinode
*/
- fstrans_start(ap->a_dvp->v_mount, FSTRANS_SHARED);
KASSERT(ap->a_vap->va_type == VLNK);
error = ufs_makeinode(ap->a_vap, ap->a_dvp, ulr, vpp, ap->a_cnp);
if (error)
@@ -1239,7 +1205,6 @@ ufs_symlink(void *v)
if (error)
vrele(vp);
out:
- fstrans_done(ap->a_dvp->v_mount);
return (error);
}
Index: src/sys/ufs/ufs/ufs_wapbl.c
diff -u src/sys/ufs/ufs/ufs_wapbl.c:1.23 src/sys/ufs/ufs/ufs_wapbl.c:1.24
--- src/sys/ufs/ufs/ufs_wapbl.c:1.23 Fri Jan 27 19:22:50 2012
+++ src/sys/ufs/ufs/ufs_wapbl.c Wed Mar 1 10:42:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_wapbl.c,v 1.23 2012/01/27 19:22:50 para Exp $ */
+/* $NetBSD: ufs_wapbl.c,v 1.24 2017/03/01 10:42:45 hannken Exp $ */
/*-
* Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_wapbl.c,v 1.23 2012/01/27 19:22:50 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_wapbl.c,v 1.24 2017/03/01 10:42:45 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_wapbl.c,
#include <sys/lockf.h>
#include <sys/kauth.h>
#include <sys/wapbl.h>
-#include <sys/fstrans.h>
#include <miscfs/specfs/specdev.h>
#include <miscfs/fifofs/fifo.h>
