From owner-svn-src-stable-10@FreeBSD.ORG  Tue Mar 25 11:46:47 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@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 ESMTPS id 09A4B447;
 Tue, 25 Mar 2014 11:46:47 +0000 (UTC)
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 E90AEF07;
 Tue, 25 Mar 2014 11:46:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2PBkkXm060269;
 Tue, 25 Mar 2014 11:46:46 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2PBkkHp060268;
 Tue, 25 Mar 2014 11:46:46 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201403251146.s2PBkkHp060268@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 25 Mar 2014 11:46:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r263716 - stable/10/usr.sbin/ctld
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Mar 2014 11:46:47 -0000

Author: trasz
Date: Tue Mar 25 11:46:46 2014
New Revision: 263716
URL: http://svnweb.freebsd.org/changeset/base/263716

Log:
  MFC r261768:
  
  Make the debug messages during ctld(8) shutdown less confusing.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/ctld/ctld.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ctld/ctld.c
==============================================================================
--- stable/10/usr.sbin/ctld/ctld.c	Tue Mar 25 11:45:03 2014	(r263715)
+++ stable/10/usr.sbin/ctld/ctld.c	Tue Mar 25 11:46:46 2014	(r263716)
@@ -1057,8 +1057,8 @@ conf_apply(struct conf *oldconf, struct 
 		if (newtarg == NULL) {
 			TAILQ_FOREACH_SAFE(oldlun, &oldtarg->t_luns, l_next,
 			    tmplun) {
-				log_debugx("target %s not found in the "
-				    "configuration file; removing its lun %d, "
+				log_debugx("target %s not found in new "
+				    "configuration; removing its lun %d, "
 				    "backed by CTL lun %d",
 				    oldtarg->t_iqn, oldlun->l_lun,
 				    oldlun->l_ctl_lun);
@@ -1084,7 +1084,7 @@ conf_apply(struct conf *oldconf, struct 
 			newlun = lun_find(newtarg, oldlun->l_lun);
 			if (newlun == NULL) {
 				log_debugx("lun %d, target %s, CTL lun %d "
-				    "not found in the configuration file; "
+				    "not found in new configuration; "
 				    "removing", oldlun->l_lun, oldtarg->t_iqn,
 				    oldlun->l_ctl_lun);
 				error = kernel_lun_remove(oldlun);