Module Name: src
Committed By: hannken
Date: Thu Mar 30 09:12:22 UTC 2017
Modified Files:
src/sys/kern: vfs_vnode.c
src/sys/miscfs/genfs: genfs_io.c genfs_vfsops.c
Log Message:
Change last users of FSTRANS_LAZY to FSTRANS_SHARED and change
genfs_suspendctl() to move from FSTRANS_NORMAL to FSTRANS_SUSPENDED
and vice versa.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.65 -r1.66 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.4 -r1.5 src/sys/miscfs/genfs/genfs_vfsops.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/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.76 src/sys/kern/vfs_vnode.c:1.77
--- src/sys/kern/vfs_vnode.c:1.76 Mon Mar 6 10:07:52 2017
+++ src/sys/kern/vfs_vnode.c Thu Mar 30 09:12:21 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.76 2017/03/06 10:07:52 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.77 2017/03/30 09:12:21 hannken Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.76 2017/03/06 10:07:52 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.77 2017/03/30 09:12:21 hannken Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -543,7 +543,7 @@ vdrain_vrele(vnode_t *vp)
KASSERT(mutex_owned(&vdrain_lock));
mp = vp->v_mount;
- if (fstrans_start_nowait(mp, FSTRANS_LAZY) != 0)
+ if (fstrans_start_nowait(mp, FSTRANS_SHARED) != 0)
return;
/*
@@ -1518,7 +1518,7 @@ vcache_reclaim(vnode_t *vp)
vip->vi_key.vk_key = temp_key;
mutex_exit(&vcache_lock);
- fstrans_start(mp, FSTRANS_LAZY);
+ fstrans_start(mp, FSTRANS_SHARED);
/*
* Clean out any cached data associated with the vnode.
Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.65 src/sys/miscfs/genfs/genfs_io.c:1.66
--- src/sys/miscfs/genfs/genfs_io.c:1.65 Thu Mar 9 10:10:02 2017
+++ src/sys/miscfs/genfs/genfs_io.c Thu Mar 30 09:12:21 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.65 2017/03/09 10:10:02 hannken Exp $ */
+/* $NetBSD: genfs_io.c,v 1.66 2017/03/30 09:12:21 hannken Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.65 2017/03/09 10:10:02 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.66 2017/03/30 09:12:21 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -890,7 +890,7 @@ retry:
if (pagedaemon) {
/* Pagedaemon must not sleep here. */
trans_mp = vp->v_mount;
- error = fstrans_start_nowait(trans_mp, FSTRANS_LAZY);
+ error = fstrans_start_nowait(trans_mp, FSTRANS_SHARED);
if (error) {
mutex_exit(slock);
return error;
@@ -903,7 +903,7 @@ retry:
*/
mutex_exit(slock);
trans_mp = vp->v_mount;
- fstrans_start(trans_mp, FSTRANS_LAZY);
+ fstrans_start(trans_mp, FSTRANS_SHARED);
if (vp->v_mount != trans_mp) {
fstrans_done(trans_mp);
trans_mp = NULL;
Index: src/sys/miscfs/genfs/genfs_vfsops.c
diff -u src/sys/miscfs/genfs/genfs_vfsops.c:1.4 src/sys/miscfs/genfs/genfs_vfsops.c:1.5
--- src/sys/miscfs/genfs/genfs_vfsops.c:1.4 Fri Feb 17 08:31:25 2017
+++ src/sys/miscfs/genfs/genfs_vfsops.c Thu Mar 30 09:12:21 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vfsops.c,v 1.4 2017/02/17 08:31:25 hannken Exp $ */
+/* $NetBSD: genfs_vfsops.c,v 1.5 2017/03/30 09:12:21 hannken Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_vfsops.c,v 1.4 2017/02/17 08:31:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_vfsops.c,v 1.5 2017/03/30 09:12:21 hannken Exp $");
#include <sys/types.h>
#include <sys/mount.h>
@@ -75,26 +75,18 @@ genfs_renamelock_exit(struct mount *mp)
int
genfs_suspendctl(struct mount *mp, int cmd)
{
- int error;
- int error2 __diagused;
+ int error __diagused;
if ((mp->mnt_iflag & IMNT_HAS_TRANS) == 0)
return EOPNOTSUPP;
switch (cmd) {
case SUSPEND_SUSPEND:
- if ((error = fstrans_setstate(mp, FSTRANS_SUSPENDING)) != 0)
- return error;
- if ((error = fstrans_setstate(mp, FSTRANS_SUSPENDED)) != 0) {
- error2 = fstrans_setstate(mp, FSTRANS_NORMAL);
- KASSERT(error2 == 0);
- return error;
- }
- return 0;
+ return fstrans_setstate(mp, FSTRANS_SUSPENDED);
case SUSPEND_RESUME:
- error2 = fstrans_setstate(mp, FSTRANS_NORMAL);
- KASSERT(error2 == 0);
+ error = fstrans_setstate(mp, FSTRANS_NORMAL);
+ KASSERT(error == 0);
return 0;
default:
