From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 22:01:34 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C24ACB63; Mon, 14 Oct 2013 22:01:34 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AF9332B37; Mon, 14 Oct 2013 22:01:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EM1YR7087421; Mon, 14 Oct 2013 22:01:34 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EM1Y1c087420; Mon, 14 Oct 2013 22:01:34 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142201.r9EM1Y1c087420@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 22:01:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256466 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 22:01:34 -0000 Author: asomers Date: Mon Oct 14 22:01:34 2013 New Revision: 256466 URL: http://svnweb.freebsd.org/changeset/base/256466 Log: cddl/sbin/zfsd/case_file.cc Log message correction: replacements are not necessarily by physical path. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:59:31 2013 (r256465) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 22:01:34 2013 (r256466) @@ -952,7 +952,7 @@ CaseFile::Replace(const char* vdev_type, if (nvlist_alloc(&nvroot, NV_UNIQUE_NAME, 0) != 0 || nvlist_alloc(&newvd, NV_UNIQUE_NAME, 0) != 0) { - syslog(LOG_ERR, "Replace vdev(%s/%s) by physical path: " + syslog(LOG_ERR, "Replace vdev(%s/%s): " "Unable to allocate configuration data.\n", poolname, VdevGUIDString().c_str()); if (nvroot != NULL) @@ -964,7 +964,7 @@ CaseFile::Replace(const char* vdev_type, || nvlist_add_string(nvroot, ZPOOL_CONFIG_TYPE, VDEV_TYPE_ROOT) != 0 || nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN, &newvd, 1) != 0) { - syslog(LOG_ERR, "Replace vdev(%s/%s) by physical path: " + syslog(LOG_ERR, "Replace vdev(%s/%s): " "Unable to initialize configuration data.\n", poolname, VdevGUIDString().c_str()); nvlist_free(newvd); @@ -978,7 +978,7 @@ CaseFile::Replace(const char* vdev_type, if (zpool_vdev_attach(zhp, VdevGUIDString().c_str(), path, nvroot, /*replace*/B_TRUE) != 0) { syslog(LOG_ERR, - "Replace vdev(%s/%s) by physical path(attach): %s: %s\n", + "Replace vdev(%s/%s): %s: %s\n", poolname, VdevGUIDString().c_str(), libzfs_error_action(g_zfsHandle), libzfs_error_description(g_zfsHandle));