Module Name: src
Committed By: pooka
Date: Mon Aug 5 11:48:22 UTC 2013
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
Also check if root vnode is busy when unmounting.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/rump/librump/rumpvfs/rumpfs.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/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.119 src/sys/rump/librump/rumpvfs/rumpfs.c:1.120
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.119 Mon Aug 5 11:14:00 2013
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Mon Aug 5 11:48:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.119 2013/08/05 11:14:00 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.120 2013/08/05 11:48:22 pooka Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.119 2013/08/05 11:14:00 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.120 2013/08/05 11:48:22 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1808,9 +1808,12 @@ rumpfs_unmount(struct mount *mp, int mnt
if (panicstr || mntflags & MNT_FORCE)
flags |= FORCECLOSE;
+ if (rfsmp->rfsmp_rvp->v_usecount > 1 && (flags & FORCECLOSE) == 0)
+ return EBUSY;
+
if ((error = vflush(mp, rfsmp->rfsmp_rvp, flags)) != 0)
return error;
- vgone(rfsmp->rfsmp_rvp); /* XXX */
+ vgone(rfsmp->rfsmp_rvp);
kmem_free(rfsmp, sizeof(*rfsmp));
