From owner-svn-src-head@FreeBSD.ORG  Tue Jan 17 01:14: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 [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 686C0106566C;
	Tue, 17 Jan 2012 01:14:57 +0000 (UTC)
	(envelope-from mckusick@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 52AE48FC21;
	Tue, 17 Jan 2012 01:14: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 q0H1Ev5w060630;
	Tue, 17 Jan 2012 01:14:57 GMT
	(envelope-from mckusick@svn.freebsd.org)
Received: (from mckusick@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0H1Ev02060628;
	Tue, 17 Jan 2012 01:14:57 GMT
	(envelope-from mckusick@svn.freebsd.org)
Message-Id: <201201170114.q0H1Ev02060628@svn.freebsd.org>
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Tue, 17 Jan 2012 01:14: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: r230250 - head/sys/ufs/ffs
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: Tue, 17 Jan 2012 01:14:57 -0000

Author: mckusick
Date: Tue Jan 17 01:14:56 2012
New Revision: 230250
URL: http://svn.freebsd.org/changeset/base/230250

Log:
  There are several bugs/hangs when trying to take a snapshot on a UFS/FFS
  filesystem running with journaled soft updates. Until these problems
  have been tracked down, return ENOTSUPP when an attempt is made to
  take a snapshot on a filesystem running with journaled soft updates.
  
  MFC after: 2 weeks

Modified:
  head/sys/ufs/ffs/ffs_snapshot.c

Modified: head/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- head/sys/ufs/ffs/ffs_snapshot.c	Tue Jan 17 01:08:01 2012	(r230249)
+++ head/sys/ufs/ffs/ffs_snapshot.c	Tue Jan 17 01:14:56 2012	(r230250)
@@ -225,10 +225,18 @@ ffs_snapshot(mp, snapfile)
 	ump = VFSTOUFS(mp);
 	fs = ump->um_fs;
 	sn = NULL;
+	/*
+	 * At the moment, journaled soft updates cannot support
+	 * taking snapshots.
+	 */
+	if (MOUNTEDSUJ(mp)) {
+		vfs_mount_error(mp, "%s: Snapshots are not yet supported when "
+		    "running with journaled soft updates", fs->fs_fsmnt);
+		return (EOPNOTSUPP);
+	}
 	MNT_ILOCK(mp);
 	flag = mp->mnt_flag;
 	MNT_IUNLOCK(mp);
-
 	/*
 	 * Need to serialize access to snapshot code per filesystem.
 	 */