Module Name: src
Committed By: hannken
Date: Fri Apr 9 08:09:18 UTC 2010
Modified Files:
src/doc: CHANGES
src/sys/fs/msdosfs: msdosfs_denode.c msdosfs_vfsops.c msdosfs_vnops.c
Log Message:
Add file system suspension support (vfs_suspend(9)) to msdosfs.
Reviewed by: Antti Kantee <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.1378 -r1.1379 src/doc/CHANGES
cvs rdiff -u -r1.37 -r1.38 src/sys/fs/msdosfs/msdosfs_denode.c
cvs rdiff -u -r1.80 -r1.81 src/sys/fs/msdosfs/msdosfs_vfsops.c
cvs rdiff -u -r1.63 -r1.64 src/sys/fs/msdosfs/msdosfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1378 src/doc/CHANGES:1.1379
--- src/doc/CHANGES:1.1378 Thu Apr 8 05:13:52 2010
+++ src/doc/CHANGES Fri Apr 9 08:09:18 2010
@@ -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]
Index: src/sys/fs/msdosfs/msdosfs_denode.c
diff -u src/sys/fs/msdosfs/msdosfs_denode.c:1.37 src/sys/fs/msdosfs/msdosfs_denode.c:1.38
--- src/sys/fs/msdosfs/msdosfs_denode.c:1.37 Fri Jan 8 11:35:08 2010
+++ src/sys/fs/msdosfs/msdosfs_denode.c Fri Apr 9 08:09:18 2010
@@ -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);
}
Index: src/sys/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.80 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.81
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.80 Wed Apr 7 15:19:09 2010
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Fri Apr 9 08:09:18 2010
@@ -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;
+ }
+}
Index: src/sys/fs/msdosfs/msdosfs_vnops.c
diff -u src/sys/fs/msdosfs/msdosfs_vnops.c:1.63 src/sys/fs/msdosfs/msdosfs_vnops.c:1.64
--- src/sys/fs/msdosfs/msdosfs_vnops.c:1.63 Thu Apr 8 16:04:35 2010
+++ src/sys/fs/msdosfs/msdosfs_vnops.c Fri Apr 9 08:09:18 2010
@@ -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;
+ }
error = detrunc(dep, (u_long)vap->va_size, 0, cred);
if (error)
- return (error);
+ goto bad;
de_changed = 1;
}
if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) {
- if (vp->v_mount->mnt_flag & MNT_RDONLY)
- return (EROFS);
+ if (vp->v_mount->mnt_flag & MNT_RDONLY) {
+ error = EROFS;
+ goto bad;
+ }
error = genfs_can_chtimes(ap->a_vp, vap->va_vaflags,
pmp->pm_uid, cred);
if (error)
- return (error);
+ goto bad;
if ((pmp->pm_flags & MSDOSFSMNT_NOWIN95) == 0 &&
vap->va_atime.tv_sec != VNOVAL)
unix2dostime(&vap->va_atime, pmp->pm_gmtoff, &dep->de_ADate, NULL, NULL);
@@ -390,12 +403,14 @@
* attribute.
*/
if (vap->va_mode != (mode_t)VNOVAL) {
- if (vp->v_mount->mnt_flag & MNT_RDONLY)
- return (EROFS);
+ if (vp->v_mount->mnt_flag & MNT_RDONLY) {
+ error = EROFS;
+ goto bad;
+ }
if (kauth_cred_geteuid(cred) != pmp->pm_uid &&
(error = kauth_authorize_generic(cred, KAUTH_GENERIC_ISSUSER,
NULL)))
- return (error);
+ goto bad;
/* We ignore the read and execute bits. */
if (vap->va_mode & S_IWUSR)
dep->de_Attributes &= ~ATTR_READONLY;
@@ -408,12 +423,14 @@
* Allow the `archived' bit to be toggled.
*/
if (vap->va_flags != VNOVAL) {
- if (vp->v_mount->mnt_flag & MNT_RDONLY)
- return (EROFS);
+ if (vp->v_mount->mnt_flag & MNT_RDONLY) {
+ error = EROFS;
+ goto bad;
+ }
if (kauth_cred_geteuid(cred) != pmp->pm_uid &&
(error = kauth_authorize_generic(cred, KAUTH_GENERIC_ISSUSER,
NULL)))
- return (error);
+ goto bad;
if (vap->va_flags & SF_ARCHIVED)
dep->de_Attributes &= ~ATTR_ARCHIVE;
else
@@ -424,9 +441,14 @@
if (de_changed) {
VN_KNOTE(vp, NOTE_ATTRIB);
- return (deupdat(dep, 1));
- } else
- return (0);
+ error = deupdat(dep, 1);
+ if (error)
+ goto bad;
+ }
+
+bad:
+ fstrans_done(vp->v_mount);
+ return error;
}
int
@@ -462,6 +484,7 @@
if (uio->uio_offset >= dep->de_FileSize)
return (0);
+ fstrans_start(vp->v_mount, FSTRANS_SHARED);
if (vp->v_type == VREG) {
const int advice = IO_ADV_DECODE(ap->a_ioflag);
@@ -495,7 +518,7 @@
/* convert cluster # to sector # */
error = pcbmap(dep, lbn, &lbn, 0, &blsize);
if (error)
- return (error);
+ goto bad;
/*
* If we are operating on a directory file then be sure to
@@ -507,7 +530,7 @@
n = MIN(n, pmp->pm_bpcluster - bp->b_resid);
if (error) {
brelse(bp, 0);
- return (error);
+ goto bad;
}
error = uiomove((char *)bp->b_data + on, (int) n, uio);
brelse(bp, 0);
@@ -516,6 +539,8 @@
out:
if ((ap->a_ioflag & IO_SYNC) == IO_SYNC)
error = deupdat(dep, 1);
+bad:
+ fstrans_done(vp->v_mount);
return (error);
}
@@ -585,6 +610,7 @@
return (EFBIG);
}
+ fstrans_start(vp->v_mount, FSTRANS_SHARED);
/*
* If the offset we are starting the write at is beyond the end of
* the file, then they've done a seek. Unix filesystems allow
@@ -592,8 +618,10 @@
* with zeroed blocks.
*/
if (uio->uio_offset > dep->de_FileSize) {
- if ((error = deextend(dep, uio->uio_offset, cred)) != 0)
+ if ((error = deextend(dep, uio->uio_offset, cred)) != 0) {
+ fstrans_done(vp->v_mount);
return (error);
+ }
}
/*
@@ -662,6 +690,7 @@
uio->uio_resid = resid;
} else if ((ioflag & IO_SYNC) == IO_SYNC)
error = deupdat(dep, 1);
+ fstrans_done(vp->v_mount);
KASSERT(vp->v_size == dep->de_FileSize);
return (error);
}
@@ -716,6 +745,7 @@
struct denode *ddep = VTODE(ap->a_dvp);
int error;
+ fstrans_start(ap->a_dvp->v_mount, FSTRANS_SHARED);
if (ap->a_vp->v_type == VDIR)
error = EPERM;
else
@@ -732,6 +762,7 @@
vput(ap->a_vp); /* causes msdosfs_inactive() to be called
* via vrele() */
vput(ap->a_dvp);
+ fstrans_done(ap->a_dvp->v_mount);
return (error);
}
@@ -889,6 +920,7 @@
}
VN_KNOTE(fdvp, NOTE_WRITE); /* XXXLUKEM/XXX: right place? */
+ fstrans_start(fdvp->v_mount, FSTRANS_SHARED);
/*
* When the target exists, both the directory
* and target vnodes are returned locked.
@@ -987,8 +1019,10 @@
* into the denode and directory entry for the destination
* file/directory.
*/
- if ((error = uniqdosname(VTODE(tdvp), tcnp, toname)) != 0)
+ if ((error = uniqdosname(VTODE(tdvp), tcnp, toname)) != 0) {
+ fstrans_done(fdvp->v_mount);
goto abortit;
+ }
/*
* Since from wasn't locked at various places above,
@@ -1004,6 +1038,7 @@
VOP_UNLOCK(fdvp, 0);
vrele(ap->a_fvp);
vrele(tdvp);
+ fstrans_done(fdvp->v_mount);
return (error);
}
if (fvp == NULL) {
@@ -1015,6 +1050,7 @@
vput(fdvp);
vrele(ap->a_fvp);
vrele(tdvp);
+ fstrans_done(fdvp->v_mount);
return 0;
}
fdvp_dorele = 1;
@@ -1127,6 +1163,7 @@
if (fdvp_dorele)
vrele(fdvp);
vrele(fvp);
+ fstrans_done(fdvp->v_mount);
return (error);
/* XXX: uuuh */
@@ -1183,6 +1220,7 @@
struct buf *bp;
int async = pdep->de_pmp->pm_mountp->mnt_flag & MNT_ASYNC;
+ 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
@@ -1272,6 +1310,7 @@
VN_KNOTE(ap->a_dvp, NOTE_WRITE | NOTE_LINK);
vput(ap->a_dvp);
*ap->a_vpp = DETOV(dep);
+ fstrans_done(ap->a_dvp->v_mount);
return (0);
bad:
@@ -1279,6 +1318,7 @@
bad2:
PNBUF_PUT(cnp->cn_pnbuf);
vput(ap->a_dvp);
+ fstrans_done(ap->a_dvp->v_mount);
return (error);
}
@@ -1306,6 +1346,7 @@
vput(vp);
return (EINVAL);
}
+ fstrans_start(ap->a_dvp->v_mount, FSTRANS_SHARED);
/*
* Verify the directory is empty (and valid).
* (Rmdir ".." won't be valid since
@@ -1347,6 +1388,7 @@
if (dvp)
vput(dvp);
vput(vp);
+ fstrans_done(ap->a_dvp->v_mount);
return (error);
}
@@ -1412,6 +1454,8 @@
uio->uio_resid = count;
uio_off = uio->uio_offset;
+ fstrans_start(ap->a_vp->v_mount, FSTRANS_SHARED);
+
/* Allocate a temporary dirent buffer. */
dirbuf = malloc(sizeof(struct dirent), M_MSDOSFSTMP, M_WAITOK | M_ZERO);
@@ -1491,8 +1535,7 @@
NOCRED, 0, &bp);
if (error) {
brelse(bp, 0);
- free(dirbuf, M_MSDOSFSTMP);
- return (error);
+ goto bad;
}
n = MIN(n, blsize - bp->b_resid);
@@ -1613,7 +1656,10 @@
} else
*ap->a_ncookies = ncookies;
}
+
+bad:
free(dirbuf, M_MSDOSFSTMP);
+ fstrans_done(ap->a_vp->v_mount);
return (error);
}
@@ -1800,6 +1846,7 @@
int wait;
int error;
+ fstrans_start(vp->v_mount, FSTRANS_LAZY);
wait = (ap->a_flags & FSYNC_WAIT) != 0;
vflushbuf(vp, wait);
if ((ap->a_flags & FSYNC_DATAONLY) != 0)
@@ -1815,6 +1862,7 @@
error = VOP_IOCTL(devvp, DIOCCACHESYNC, &l, FWRITE,
curlwp->l_cred);
}
+ fstrans_done(vp->v_mount);
return (error);
}
