From owner-svn-src-all@FreeBSD.ORG Wed May 7 07:44:18 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5108A493; Wed, 7 May 2014 07:44:18 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D0691C0; Wed, 7 May 2014 07:44:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s477iIv5024897; Wed, 7 May 2014 07:44:18 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s477iIYd024896; Wed, 7 May 2014 07:44:18 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201405070744.s477iIYd024896@svn.freebsd.org> From: Edward Tomasz Napierala Date: Wed, 7 May 2014 07:44:18 +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: r265519 - 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2014 07:44:18 -0000 Author: trasz Date: Wed May 7 07:44:17 2014 New Revision: 265519 URL: http://svnweb.freebsd.org/changeset/base/265519 Log: MFC r264535: English. 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 Wed May 7 07:43:13 2014 (r265518) +++ stable/10/usr.sbin/ctld/ctld.c Wed May 7 07:44:17 2014 (r265519) @@ -1225,9 +1225,9 @@ conf_apply(struct conf *oldconf, struct /* * XXX: If target or lun removal fails, we should somehow "move" * the old lun or target into newconf, so that subsequent - * conf_apply() will try to remove them again. That would - * be somewhat hairy, and lun deletion doesn't really happen, - * so leave it as it is for now. + * conf_apply() would try to remove them again. That would + * be somewhat hairy, though, and lun deletion failures don't + * really happen, so leave it as it is for now. */ TAILQ_FOREACH_SAFE(oldtarg, &oldconf->conf_targets, t_next, tmptarg) { /*