From owner-svn-src-all@FreeBSD.ORG Wed May 7 08:04:41 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 DF07B993; Wed, 7 May 2014 08:04:41 +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 C98B23B0; Wed, 7 May 2014 08:04:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4784fcU034953; Wed, 7 May 2014 08:04:41 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4784frg034952; Wed, 7 May 2014 08:04:41 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201405070804.s4784frg034952@svn.freebsd.org> From: Edward Tomasz Napierala Date: Wed, 7 May 2014 08:04:41 +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: r265532 - stable/10/usr.bin/iscsictl 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 08:04:42 -0000 Author: trasz Date: Wed May 7 08:04:41 2014 New Revision: 265532 URL: http://svnweb.freebsd.org/changeset/base/265532 Log: MFC r264405: Fix periph listing when IOCTL buffer border hits result for wanted bus. Modified: stable/10/usr.bin/iscsictl/periphs.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/iscsictl/periphs.c ============================================================================== --- stable/10/usr.bin/iscsictl/periphs.c Wed May 7 08:03:30 2014 (r265531) +++ stable/10/usr.bin/iscsictl/periphs.c Wed May 7 08:04:41 2014 (r265532) @@ -102,6 +102,9 @@ print_periphs(int session_id) ccb.cdm.num_patterns = 0; ccb.cdm.pattern_buf_len = 0; + skip_bus = 1; + skip_device = 1; + /* * We do the ioctl multiple times if necessary, in case there are * more than 100 nodes in the EDT. @@ -120,9 +123,6 @@ print_periphs(int session_id) break; } - skip_bus = 1; - skip_device = 1; - for (i = 0; i < ccb.cdm.num_matches; i++) { switch (ccb.cdm.matches[i].type) { case DEV_MATCH_BUS: {