From owner-svn-src-head@FreeBSD.ORG  Wed Aug  1 23:05:57 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DBC021065673;
	Wed,  1 Aug 2012 23:05:57 +0000 (UTC)
	(envelope-from avatar@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C697C8FC12;
	Wed,  1 Aug 2012 23:05:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q71N5vNi009603;
	Wed, 1 Aug 2012 23:05:57 GMT (envelope-from avatar@svn.freebsd.org)
Received: (from avatar@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q71N5vD6009601;
	Wed, 1 Aug 2012 23:05:57 GMT (envelope-from avatar@svn.freebsd.org)
Message-Id: <201208012305.q71N5vD6009601@svn.freebsd.org>
From: Tai-hwa Liang <avatar@FreeBSD.org>
Date: Wed, 1 Aug 2012 23:05:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238980 - head/sys/gnu/fs/reiserfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2012 23:05:58 -0000

Author: avatar
Date: Wed Aug  1 23:05:57 2012
New Revision: 238980
URL: http://svn.freebsd.org/changeset/base/238980

Log:
    Just like the other file systems found in /sys/fs, g_vfs_open()
  should be paried with g_vfs_close().  Though g_vfs_close() is a wrapper
  around g_wither_geom_close(), r206130 added the following test in
  g_vfs_open():
  
  	if (bo->bo_private != vp)
  		return (EBUSY);
  
    Which will cause a 'Device busy' error inside reiserfs_mountfs() if
  the same file system is re-mounted again after umount or mounting failure:
  
  	(case 1, /dev/ad4s3 is not a valid REISERFS partition)
  	# mount -t reiserfs -o ro /dev/ad4s3 /mnt
  	mount: /dev/ad4s3: Invalid argument
  	# mount -t msdosfs -o ro /dev/ad4s3 /mnt
  	mount: /dev/ad4s3: Device busy
  
  	(case 2, /dev/ad4s3 is a valid REISERFS partition)
  	# mount -t reiserfs -o ro /dev/ad4s3 /mnt
  	# umount /mnt
  	# mount -t reiserfs -o ro /dev/ad4s3 /mnt
  	mount: /dev/ad4s3: Device busy
  
    On the other hand, g_vfs_close() 'fixed' the above cases by doing an
  extra step to keep 'sc->sc_bo->bo_private' and 'cp->private' pointers
  synchronised.
  
  Reviewed by:	kib
  MFC after:	1 month

Modified:
  head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c

Modified: head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
==============================================================================
--- head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c	Wed Aug  1 19:27:12 2012	(r238979)
+++ head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c	Wed Aug  1 23:05:57 2012	(r238980)
@@ -227,7 +227,7 @@ reiserfs_unmount(struct mount *mp, int m
 
 	DROP_GIANT();
 	g_topology_lock();
-	g_wither_geom_close(rmp->rm_cp->geom, ENXIO);
+	g_vfs_close(rmp->rm_cp);
 	g_topology_unlock();
 	PICKUP_GIANT();
 	vrele(rmp->rm_devvp);
@@ -611,7 +611,7 @@ out:
 	if (cp != NULL) {
 		DROP_GIANT();
 		g_topology_lock();
-		g_wither_geom_close(cp->geom, ENXIO);
+		g_vfs_close(cp);
 		g_topology_unlock();
 		PICKUP_GIANT();
 	}