From owner-svn-src-all@FreeBSD.ORG  Mon Jan 18 05:24:52 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4FBEC106566C;
	Mon, 18 Jan 2010 05:24:52 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D5398FC1B;
	Mon, 18 Jan 2010 05:24:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0I5Oq3L061089;
	Mon, 18 Jan 2010 05:24:52 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0I5Oqd6061087;
	Mon, 18 Jan 2010 05:24:52 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201001180524.o0I5Oqd6061087@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 18 Jan 2010 05:24:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202551 -
	stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Mon, 18 Jan 2010 05:24:52 -0000

Author: delphij
Date: Mon Jan 18 05:24:51 2010
New Revision: 202551
URL: http://svn.freebsd.org/changeset/base/202551

Log:
  MFC r202129:
  
  Report ZFS filesystem version instead of the zpool version when we say it.
  
  Reported by:	Yuri Pankov (on -fs@)
  Submitted by:	delphij

Modified:
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Mon Jan 18 05:22:27 2010	(r202550)
+++ stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Mon Jan 18 05:24:51 2010	(r202551)
@@ -1398,7 +1398,7 @@ void
 zfs_init(void)
 {
 
-	printf("ZFS filesystem version " SPA_VERSION_STRING "\n");
+	printf("ZFS filesystem version " ZPL_VERSION_STRING "\n");
 
 	/*
 	 * Initialize znode cache, vnode ops, etc...