From owner-svn-src-all@FreeBSD.ORG Sat Nov 24 12:44:26 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 06E26D02;
Sat, 24 Nov 2012 12:44:26 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id DFAF98FC14;
Sat, 24 Nov 2012 12:44:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAOCiPgQ052734;
Sat, 24 Nov 2012 12:44:25 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAOCiPdg052733;
Sat, 24 Nov 2012 12:44:25 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201211241244.qAOCiPdg052733@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 24 Nov 2012 12:44:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r243487 -
stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Nov 2012 12:44:26 -0000
Author: avg
Date: Sat Nov 24 12:44:25 2012
New Revision: 243487
URL: http://svnweb.freebsd.org/changeset/base/243487
Log:
MFC r242570: zfs_umount: no need to set MNTK_UNMOUNTF here, dounmount
handles that
Modified:
stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/cddl/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sat Nov 24 12:44:13 2012 (r243486)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sat Nov 24 12:44:25 2012 (r243487)
@@ -1962,10 +1962,6 @@ zfs_umount(vfs_t *vfsp, int fflag)
zfsvfs->z_ctldir->v_count > 1)
return (EBUSY);
}
- } else {
- MNT_ILOCK(vfsp);
- vfsp->mnt_kern_flag |= MNTK_UNMOUNTF;
- MNT_IUNLOCK(vfsp);
}
VERIFY(zfsvfs_teardown(zfsvfs, B_TRUE) == 0);