Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Add file system suspension support (vfs_suspend(9)) to msdosfs.
details: https://anonhg.NetBSD.org/src/rev/60954c8eca40
branches: trunk
changeset: 753750:60954c8eca40
user: hannken <hannken%NetBSD.org@localhost>
date: Fri Apr 09 08:09:18 2010 +0000
description:
Add file system suspension support (vfs_suspend(9)) to msdosfs.
Reviewed by: Antti Kantee <pooka%netbsd.org@localhost>
diffstat:
doc/CHANGES | 3 +-
sys/fs/msdosfs/msdosfs_denode.c | 8 ++-
sys/fs/msdosfs/msdosfs_vfsops.c | 61 +++++++++++++++++++++++--
sys/fs/msdosfs/msdosfs_vnops.c | 94 ++++++++++++++++++++++++++++++----------
4 files changed, 134 insertions(+), 32 deletions(-)
diffs (truncated from 584 to 300 lines):
diff -r 1519332b047f -r 60954c8eca40 doc/CHANGES
--- a/doc/CHANGES Fri Apr 09 04:48:23 2010 +0000
+++ b/doc/CHANGES Fri Apr 09 08:09:18 2010 +0000
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1378 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1379 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -580,3 +580,4 @@
connected to Atari ROM cartridge slot. [tsutsui 20100401]
agp(4): Add support for the Intel 82855GM AGP port. [jakllsch 20100404]
acpi(4): Updated ACPICA to 20100121. [jruoho 20100408]
+ fss(4): Add snapshot support for MSDOS file systems. [hannken 20100409]
diff -r 1519332b047f -r 60954c8eca40 sys/fs/msdosfs/msdosfs_denode.c
--- a/sys/fs/msdosfs/msdosfs_denode.c Fri Apr 09 04:48:23 2010 +0000
+++ b/sys/fs/msdosfs/msdosfs_denode.c Fri Apr 09 08:09:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_denode.c,v 1.37 2010/01/08 11:35:08 pooka Exp $ */
+/* $NetBSD: msdosfs_denode.c,v 1.38 2010/04/09 08:09:18 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,11 +48,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.37 2010/01/08 11:35:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.38 2010/04/09 08:09:18 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mount.h>
+#include <sys/fstrans.h>
#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/proc.h>
@@ -655,6 +656,7 @@
bool *a_recycle;
} */ *ap = v;
struct vnode *vp = ap->a_vp;
+ struct mount *mp = vp->v_mount;
struct denode *dep = VTODE(vp);
int error = 0;
@@ -662,6 +664,7 @@
printf("msdosfs_inactive(): dep %p, de_Name[0] %x\n", dep, dep->de_Name[0]);
#endif
+ fstrans_start(mp, FSTRANS_LAZY);
/*
* Get rid of denodes related to stale file handles.
*/
@@ -696,6 +699,7 @@
#endif
*ap->a_recycle = (dep->de_Name[0] == SLOT_DELETED);
VOP_UNLOCK(vp, 0);
+ fstrans_done(mp);
return (error);
}
diff -r 1519332b047f -r 60954c8eca40 sys/fs/msdosfs/msdosfs_vfsops.c
--- a/sys/fs/msdosfs/msdosfs_vfsops.c Fri Apr 09 04:48:23 2010 +0000
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c Fri Apr 09 08:09:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.80 2010/04/07 15:19:09 pooka Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.81 2010/04/09 08:09:18 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.80 2010/04/07 15:19:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.81 2010/04/09 08:09:18 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -69,6 +69,7 @@
#include <sys/device.h>
#include <sys/disklabel.h>
#include <sys/disk.h>
+#include <sys/fstrans.h>
#include <sys/ioctl.h>
#include <sys/malloc.h>
#include <sys/dirent.h>
@@ -136,7 +137,7 @@
msdosfs_mountroot,
(int (*)(struct mount *, struct vnode *, struct timespec *)) eopnotsupp,
vfs_stdextattrctl,
- (void *)eopnotsupp, /* vfs_suspendctl */
+ msdosfs_suspendctl,
genfs_renamelock_enter,
genfs_renamelock_exit,
(void *)eopnotsupp,
@@ -483,6 +484,10 @@
bp = NULL; /* both used in error_exit */
pmp = NULL;
+ error = fstrans_mount(mp);
+ if (error)
+ goto error_exit;
+
error = getdisksize(devvp, &psize, &secsize);
if (error)
goto error_exit;
@@ -812,6 +817,7 @@
return (0);
error_exit:
+ fstrans_unmount(mp);
if (bp)
brelse(bp, BC_AGE);
if (pmp) {
@@ -878,6 +884,7 @@
free(pmp, M_MSDOSFSMNT);
mp->mnt_data = NULL;
mp->mnt_flag &= ~MNT_LOCAL;
+ fstrans_unmount(mp);
return (0);
}
@@ -924,7 +931,8 @@
struct vnode *vp, *mvp;
struct denode *dep;
struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
- int error, allerror = 0;
+ int lk_flags, error, allerror = 0;
+ bool is_suspending;
/*
* If we ever switch to not updating all of the fats all the time,
@@ -940,6 +948,16 @@
/* Allocate a marker vnode. */
if ((mvp = vnalloc(mp)) == NULL)
return ENOMEM;
+ fstrans_start(mp, FSTRANS_SHARED);
+ is_suspending = (fstrans_getstate(mp) == FSTRANS_SUSPENDING);
+ /*
+ * We can't lock vnodes while the file system is suspending because
+ * threads waiting on fstrans may have locked vnodes.
+ */
+ if (is_suspending)
+ lk_flags = LK_INTERLOCK;
+ else
+ lk_flags = LK_INTERLOCK | LK_EXCLUSIVE | LK_NOWAIT;
/*
* Write back each (modified) denode.
*/
@@ -960,7 +978,7 @@
continue;
}
mutex_exit(&mntvnode_lock);
- error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK);
+ error = vget(vp, lk_flags);
if (error) {
mutex_enter(&mntvnode_lock);
if (error == ENOENT) {
@@ -972,7 +990,10 @@
if ((error = VOP_FSYNC(vp, cred,
waitfor == MNT_WAIT ? FSYNC_WAIT : 0, 0, 0)) != 0)
allerror = error;
- vput(vp);
+ if (is_suspending)
+ vrele(vp);
+ else
+ vput(vp);
mutex_enter(&mntvnode_lock);
}
mutex_exit(&mntvnode_lock);
@@ -984,6 +1005,7 @@
if ((error = VOP_FSYNC(pmp->pm_devvp, cred,
waitfor == MNT_WAIT ? FSYNC_WAIT : 0, 0, 0)) != 0)
allerror = error;
+ fstrans_done(mp);
return (allerror);
}
@@ -1040,3 +1062,30 @@
return (EOPNOTSUPP);
}
+
+int
+msdosfs_suspendctl(struct mount *mp, int cmd)
+{
+ int error;
+ struct lwp *l = curlwp;
+
+ switch (cmd) {
+ case SUSPEND_SUSPEND:
+ if ((error = fstrans_setstate(mp, FSTRANS_SUSPENDING)) != 0)
+ return error;
+ error = msdosfs_sync(mp, MNT_WAIT, l->l_proc->p_cred);
+ if (error == 0)
+ error = fstrans_setstate(mp, FSTRANS_SUSPENDED);
+ if (error != 0) {
+ (void) fstrans_setstate(mp, FSTRANS_NORMAL);
+ return error;
+ }
+ return 0;
+
+ case SUSPEND_RESUME:
+ return fstrans_setstate(mp, FSTRANS_NORMAL);
+
+ default:
+ return EINVAL;
+ }
+}
diff -r 1519332b047f -r 60954c8eca40 sys/fs/msdosfs/msdosfs_vnops.c
--- a/sys/fs/msdosfs/msdosfs_vnops.c Fri Apr 09 04:48:23 2010 +0000
+++ b/sys/fs/msdosfs/msdosfs_vnops.c Fri Apr 09 08:09:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vnops.c,v 1.63 2010/04/08 16:04:35 pooka Exp $ */
+/* $NetBSD: msdosfs_vnops.c,v 1.64 2010/04/09 08:09:18 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.63 2010/04/08 16:04:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.64 2010/04/09 08:09:18 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,6 +60,7 @@
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/mount.h>
+#include <sys/fstrans.h>
#include <sys/vnode.h>
#include <sys/signalvar.h>
#include <sys/malloc.h>
@@ -121,6 +122,7 @@
printf("msdosfs_create(cnp %p, vap %p\n", cnp, ap->a_vap);
#endif
+ fstrans_start(ap->a_dvp->v_mount, FSTRANS_SHARED);
/*
* If this is the root directory and there is no space left we
* can't do anything. This is because the root directory can not
@@ -159,12 +161,14 @@
goto bad;
if ((cnp->cn_flags & SAVESTART) == 0)
PNBUF_PUT(cnp->cn_pnbuf);
+ fstrans_done(ap->a_dvp->v_mount);
VN_KNOTE(ap->a_dvp, NOTE_WRITE);
vput(ap->a_dvp);
*ap->a_vpp = DETOV(dep);
return (0);
bad:
+ fstrans_done(ap->a_dvp->v_mount);
PNBUF_PUT(cnp->cn_pnbuf);
vput(ap->a_dvp);
return (error);
@@ -181,10 +185,12 @@
struct vnode *vp = ap->a_vp;
struct denode *dep = VTODE(vp);
+ fstrans_start(vp->v_mount, FSTRANS_SHARED);
mutex_enter(&vp->v_interlock);
if (vp->v_usecount > 1)
DETIMES(dep, NULL, NULL, NULL, dep->de_pmp->pm_gmtoff);
mutex_exit(&vp->v_interlock);
+ fstrans_done(vp->v_mount);
return (0);
}
@@ -265,6 +271,7 @@
u_long dirsperblk = pmp->pm_BytesPerSec / sizeof(struct direntry);
ino_t fileid;
+ fstrans_start(ap->a_vp->v_mount, FSTRANS_SHARED);
DETIMES(dep, NULL, NULL, NULL, pmp->pm_gmtoff);
vap->va_fsid = dep->de_dev;
/*
@@ -313,6 +320,7 @@
vap->va_bytes =
(dep->de_FileSize + pmp->pm_crbomask) & ~pmp->pm_crbomask;
vap->va_type = ap->a_vp->v_type;
+ fstrans_done(ap->a_vp->v_mount);
return (0);
}
@@ -360,21 +368,26 @@
if (ap->a_vp->v_type == VDIR)
return 0;
+ fstrans_start(vp->v_mount, FSTRANS_SHARED);
if (vap->va_size != VNOVAL) {
- if (vp->v_mount->mnt_flag & MNT_RDONLY)
- return (EROFS);
+ if (vp->v_mount->mnt_flag & MNT_RDONLY) {
+ error = EROFS;
+ goto bad;
+ }
Home |
Main Index |
Thread Index |
Old Index