From owner-svn-src-stable-8@FreeBSD.ORG Thu Oct 20 19:16:52 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7ECF106564A; Thu, 20 Oct 2011 19:16:52 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B61738FC12; Thu, 20 Oct 2011 19:16:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9KJGqJA087934; Thu, 20 Oct 2011 19:16:52 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9KJGqaJ087932; Thu, 20 Oct 2011 19:16:52 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201110201916.p9KJGqaJ087932@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 20 Oct 2011 19:16:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226579 - stable/8/sys/dev/iscsi/initiator X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2011 19:16:52 -0000 Author: kib Date: Thu Oct 20 19:16:52 2011 New Revision: 226579 URL: http://svn.freebsd.org/changeset/base/226579 Log: MFC r226208: Do not ignore block offsets. PR: kern/160943 Modified: stable/8/sys/dev/iscsi/initiator/iscsi_subr.c Directory Properties: stable/8/sys/ (props changed) Modified: stable/8/sys/dev/iscsi/initiator/iscsi_subr.c ============================================================================== --- stable/8/sys/dev/iscsi/initiator/iscsi_subr.c Thu Oct 20 18:54:05 2011 (r226578) +++ stable/8/sys/dev/iscsi/initiator/iscsi_subr.c Thu Oct 20 19:16:52 2011 (r226579) @@ -84,6 +84,7 @@ iscsi_r2t(isc_session_t *sp, pduq_t *opq caddr_t bp = csio->data_ptr; bo = ntohl(r2t->bo); + bp += MIN(bo, edtl - ddtl); bleft = ddtl; if(sp->opt.maxXmitDataSegmentLength > 0) // danny's RFC