From owner-svn-src-all@FreeBSD.ORG Thu Jan 12 15:50:22 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 554971065670;
Thu, 12 Jan 2012 15:50:22 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 3BFC58FC15;
Thu, 12 Jan 2012 15:50:22 +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 q0CFoMRx016221;
Thu, 12 Jan 2012 15:50:22 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0CFoMsW016219;
Thu, 12 Jan 2012 15:50:22 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201201121550.q0CFoMsW016219@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 12 Jan 2012 15:50:22 +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: r230018 - stable/8/share/examples/scsi_target
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Jan 2012 15:50:22 -0000
Author: mav
Date: Thu Jan 12 15:50:21 2012
New Revision: 230018
URL: http://svn.freebsd.org/changeset/base/230018
Log:
MFC r228462:
- Fix different variable types use in different files after r121184,
causing problems on amd64.
- s/%lud/%lu/.
Sponsored by: iXsystems, Inc.
Modified:
stable/8/share/examples/scsi_target/scsi_cmds.c
Directory Properties:
stable/8/share/examples/ (props changed)
stable/8/share/examples/cvsup/ (props changed)
Modified: stable/8/share/examples/scsi_target/scsi_cmds.c
==============================================================================
--- stable/8/share/examples/scsi_target/scsi_cmds.c Thu Jan 12 15:49:06 2012 (r230017)
+++ stable/8/share/examples/scsi_target/scsi_cmds.c Thu Jan 12 15:50:21 2012 (r230018)
@@ -103,8 +103,8 @@ static struct targ_cdb_handlers cdb_hand
static struct scsi_inquiry_data inq_data;
static struct initiator_state istates[MAX_INITIATORS];
extern int debug;
-extern uint64_t volume_size;
-extern size_t sector_size;
+extern off_t volume_size;
+extern u_int sector_size;
extern size_t buf_size;
cam_status
@@ -609,7 +609,7 @@ start_io(struct ccb_accept_tio *atio, st
if (dir == CAM_DIR_IN) {
if (notaio) {
if (debug)
- warnx("read sync %lud @ block " OFF_FMT,
+ warnx("read sync %lu @ block " OFF_FMT,
(unsigned long)
(ctio->dxfer_len / sector_size),
c_descr->offset / sector_size);
@@ -625,7 +625,7 @@ start_io(struct ccb_accept_tio *atio, st
}
} else {
if (debug)
- warnx("read async %lud @ block " OFF_FMT,
+ warnx("read async %lu @ block " OFF_FMT,
(unsigned long)
(ctio->dxfer_len / sector_size),
c_descr->offset / sector_size);
@@ -725,7 +725,7 @@ tcmd_rdwr_done(struct ccb_accept_tio *at
a_descr->targ_req += ctio->dxfer_len;
if (notaio) {
if (debug)
- warnx("write sync %lud @ block "
+ warnx("write sync %lu @ block "
OFF_FMT, (unsigned long)
(ctio->dxfer_len / sector_size),
c_descr->offset / sector_size);
@@ -742,7 +742,7 @@ tcmd_rdwr_done(struct ccb_accept_tio *at
tcmd_rdwr_done(atio, ctio, AIO_DONE);
} else {
if (debug)
- warnx("write async %lud @ block "
+ warnx("write async %lu @ block "
OFF_FMT, (unsigned long)
(ctio->dxfer_len / sector_size),
c_descr->offset / sector_size);