From owner-svn-src-stable-9@FreeBSD.ORG Thu Oct 4 09:49:53 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A2B33106566B; Thu, 4 Oct 2012 09:49:53 +0000 (UTC) (envelope-from fjoe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E38198FC14; Thu, 4 Oct 2012 09:49:53 +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 q949nr9I021083; Thu, 4 Oct 2012 09:49:53 GMT (envelope-from fjoe@svn.freebsd.org) Received: (from fjoe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q949nrXa021057; Thu, 4 Oct 2012 09:49:53 GMT (envelope-from fjoe@svn.freebsd.org) Message-Id: <201210040949.q949nrXa021057@svn.freebsd.org> From: Max Khon Date: Thu, 4 Oct 2012 09:49:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r241192 - in stable/9: . gnu/usr.bin/gdb gnu/usr.bin/gdb/arch/amd64 gnu/usr.bin/gdb/arch/arm gnu/usr.bin/gdb/arch/i386 gnu/usr.bin/gdb/arch/ia64 gnu/usr.bin/gdb/arch/mips gnu/usr.bin/gd... X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Oct 2012 09:49:53 -0000 Author: fjoe Date: Thu Oct 4 09:49:53 2012 New Revision: 241192 URL: http://svn.freebsd.org/changeset/base/241192 Log: MFC: r241002 Fix pseudo checksum calculation. This fixes ipfilter w/ network controllers that implement only partial rx csum offloading. PR: 106438 Obtained from: upstream Modified: stable/9/Makefile.inc1 stable/9/gnu/usr.bin/gdb/Makefile.inc stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile stable/9/gnu/usr.bin/gdb/arch/amd64/init.c stable/9/gnu/usr.bin/gdb/arch/arm/Makefile stable/9/gnu/usr.bin/gdb/arch/arm/init.c stable/9/gnu/usr.bin/gdb/arch/i386/Makefile stable/9/gnu/usr.bin/gdb/arch/i386/init.c stable/9/gnu/usr.bin/gdb/arch/ia64/Makefile stable/9/gnu/usr.bin/gdb/arch/ia64/init.c stable/9/gnu/usr.bin/gdb/arch/mips/Makefile stable/9/gnu/usr.bin/gdb/arch/mips/init.c stable/9/gnu/usr.bin/gdb/arch/powerpc/Makefile stable/9/gnu/usr.bin/gdb/arch/powerpc/init.c stable/9/gnu/usr.bin/gdb/arch/powerpc64/Makefile stable/9/gnu/usr.bin/gdb/arch/powerpc64/init.c stable/9/kerberos5/usr.bin/kadmin/Makefile stable/9/kerberos5/usr.sbin/ktutil/Makefile stable/9/rescue/rescue/Makefile stable/9/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/9/sys/fs/ext2fs/ext2_bmap.c stable/9/sys/fs/ext2fs/ext2_extern.h stable/9/sys/fs/ext2fs/ext2_vnops.c stable/9/usr.bin/grep/util.c Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/Makefile.inc1 ============================================================================== --- stable/9/Makefile.inc1 Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/Makefile.inc1 Thu Oct 4 09:49:53 2012 (r241192) @@ -172,7 +172,11 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.$ .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp # /usr/games added for fortune which depend on strfile +.if defined(NO_WORLDTMP) +BPATH= ${PATH} +.else BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games +.endif XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} Modified: stable/9/gnu/usr.bin/gdb/Makefile.inc ============================================================================== --- stable/9/gnu/usr.bin/gdb/Makefile.inc Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/Makefile.inc Thu Oct 4 09:49:53 2012 (r241192) @@ -45,6 +45,7 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config CFLAGS+= -I${CNTRB_BU}/include CFLAGS+= -I${CNTRB_GDB}/include CFLAGS+= -I${CNTRB_BU}/bfd +DEBUG_FLAGS= -g -O0 GENSRCS+= nm.h tm.h Modified: stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile Thu Oct 4 09:49:53 2012 (r241192) @@ -5,7 +5,7 @@ GENSRCS+= xm.h LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c .endif -LIBSRCS+= solib.c solib-svr4.c +LIBSRCS+= solib.c solib-svr4.c solib-legacy.c LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \ i386fbsd-tdep-fixed.c i387-tdep.c Modified: stable/9/gnu/usr.bin/gdb/arch/amd64/init.c ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/amd64/init.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/amd64/init.c Thu Oct 4 09:49:53 2012 (r241192) @@ -12,6 +12,7 @@ extern initialize_file_ftype _initialize extern initialize_file_ftype _initialize_corelow; extern initialize_file_ftype _initialize_solib; extern initialize_file_ftype _initialize_svr4_solib; +extern initialize_file_ftype _initialize_svr4_lm; extern initialize_file_ftype _initialize_ser_hardwire; extern initialize_file_ftype _initialize_ser_pipe; extern initialize_file_ftype _initialize_ser_tcp; @@ -126,6 +127,7 @@ initialize_all_files (void) _initialize_corelow (); _initialize_solib (); _initialize_svr4_solib (); + _initialize_svr4_lm (); _initialize_ser_hardwire (); _initialize_ser_pipe (); _initialize_ser_tcp (); Modified: stable/9/gnu/usr.bin/gdb/arch/arm/Makefile ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/arm/Makefile Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/arm/Makefile Thu Oct 4 09:49:53 2012 (r241192) @@ -2,7 +2,7 @@ GENSRCS+= xm.h LIBSRCS+= armfbsd-nat.c -LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c +LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c solib-legacy.c .if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= fbsd-threads.c .endif Modified: stable/9/gnu/usr.bin/gdb/arch/arm/init.c ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/arm/init.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/arm/init.c Thu Oct 4 09:49:53 2012 (r241192) @@ -10,6 +10,7 @@ extern initialize_file_ftype _initialize extern initialize_file_ftype _initialize_corelow; extern initialize_file_ftype _initialize_solib; extern initialize_file_ftype _initialize_svr4_solib; +extern initialize_file_ftype _initialize_svr4_lm; extern initialize_file_ftype _initialize_ser_hardwire; extern initialize_file_ftype _initialize_ser_pipe; extern initialize_file_ftype _initialize_ser_tcp; @@ -122,6 +123,7 @@ initialize_all_files (void) _initialize_corelow (); _initialize_solib (); _initialize_svr4_solib (); + _initialize_svr4_lm (); _initialize_ser_hardwire (); _initialize_ser_pipe (); _initialize_ser_tcp (); Modified: stable/9/gnu/usr.bin/gdb/arch/i386/Makefile ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/i386/Makefile Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/i386/Makefile Thu Oct 4 09:49:53 2012 (r241192) @@ -5,7 +5,7 @@ GENSRCS+= xm.h LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c LIBSRCS+= i386-nat.c i386bsd-nat.c i386fbsd-nat.c .endif -LIBSRCS+= solib.c solib-svr4.c +LIBSRCS+= solib.c solib-svr4.c solib-legacy.c LIBSRCS+= i386-tdep.c i386bsd-tdep.c i386fbsd-tdep-fixed.c i387-tdep.c nm.h: Modified: stable/9/gnu/usr.bin/gdb/arch/i386/init.c ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/i386/init.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/i386/init.c Thu Oct 4 09:49:53 2012 (r241192) @@ -11,6 +11,7 @@ extern initialize_file_ftype _initialize extern initialize_file_ftype _initialize_corelow; extern initialize_file_ftype _initialize_solib; extern initialize_file_ftype _initialize_svr4_solib; +extern initialize_file_ftype _initialize_svr4_lm; extern initialize_file_ftype _initialize_ser_hardwire; extern initialize_file_ftype _initialize_ser_pipe; extern initialize_file_ftype _initialize_ser_tcp; @@ -126,6 +127,7 @@ initialize_all_files (void) _initialize_corelow (); _initialize_solib (); _initialize_svr4_solib (); + _initialize_svr4_lm (); _initialize_ser_hardwire (); _initialize_ser_pipe (); _initialize_ser_tcp (); Modified: stable/9/gnu/usr.bin/gdb/arch/ia64/Makefile ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/ia64/Makefile Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/ia64/Makefile Thu Oct 4 09:49:53 2012 (r241192) @@ -4,7 +4,7 @@ LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c LIBSRCS+= ia64-fbsd-nat.c .endif -LIBSRCS+= solib.c solib-svr4.c +LIBSRCS+= solib.c solib-svr4.c solib-legacy.c LIBSRCS+= ia64-fbsd-tdep.c ia64-tdep.c nm.h: Modified: stable/9/gnu/usr.bin/gdb/arch/ia64/init.c ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/ia64/init.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/ia64/init.c Thu Oct 4 09:49:53 2012 (r241192) @@ -10,6 +10,7 @@ extern initialize_file_ftype _initialize extern initialize_file_ftype _initialize_ia64_tdep; extern initialize_file_ftype _initialize_solib; extern initialize_file_ftype _initialize_svr4_solib; +extern initialize_file_ftype _initialize_svr4_lm; extern initialize_file_ftype _initialize_ser_hardwire; extern initialize_file_ftype _initialize_ser_pipe; extern initialize_file_ftype _initialize_ser_tcp; @@ -122,6 +123,7 @@ initialize_all_files (void) _initialize_ia64_tdep (); _initialize_solib (); _initialize_svr4_solib (); + _initialize_svr4_lm (); _initialize_ser_hardwire (); _initialize_ser_pipe (); _initialize_ser_tcp (); Modified: stable/9/gnu/usr.bin/gdb/arch/mips/Makefile ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/mips/Makefile Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/mips/Makefile Thu Oct 4 09:49:53 2012 (r241192) @@ -3,7 +3,7 @@ .if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= mipsfbsd-nat.c fbsd-threads.c .endif -LIBSRCS+= solib.c solib-svr4.c +LIBSRCS+= solib.c solib-svr4.c solib-legacy.c LIBSRCS+= mips-tdep.c mipsfbsd-tdep.c fbsd-proc.c nm.h: Modified: stable/9/gnu/usr.bin/gdb/arch/mips/init.c ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/mips/init.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/mips/init.c Thu Oct 4 09:49:53 2012 (r241192) @@ -121,6 +121,7 @@ initialize_all_files (void) _initialize_corelow (); _initialize_solib (); _initialize_svr4_solib (); + _initialize_svr4_lm (); _initialize_ser_hardwire (); _initialize_ser_pipe (); _initialize_ser_tcp (); @@ -133,10 +134,8 @@ initialize_all_files (void) _initialize_infptrace (); _initialize_inftarg (); _initialize_thread_db (); -#if 0 _initialize_svr4_lm (); #endif -#endif _initialize_remote (); _initialize_dcache (); _initialize_sr_support (); Modified: stable/9/gnu/usr.bin/gdb/arch/powerpc/Makefile ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/powerpc/Makefile Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/powerpc/Makefile Thu Oct 4 09:49:53 2012 (r241192) @@ -4,7 +4,7 @@ LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c LIBSRCS+= ppcfbsd-nat.c .endif -LIBSRCS+= solib.c solib-svr4.c +LIBSRCS+= solib.c solib-svr4.c solib-legacy.c LIBSRCS+= ppc-sysv-tdep.c ppcfbsd-tdep.c rs6000-tdep.c nm.h: Modified: stable/9/gnu/usr.bin/gdb/arch/powerpc/init.c ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/powerpc/init.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/powerpc/init.c Thu Oct 4 09:49:53 2012 (r241192) @@ -10,6 +10,7 @@ extern initialize_file_ftype _initialize extern initialize_file_ftype _initialize_corelow; extern initialize_file_ftype _initialize_solib; extern initialize_file_ftype _initialize_svr4_solib; +extern initialize_file_ftype _initialize_svr4_lm; extern initialize_file_ftype _initialize_ser_hardwire; extern initialize_file_ftype _initialize_ser_pipe; extern initialize_file_ftype _initialize_ser_tcp; @@ -122,6 +123,7 @@ initialize_all_files (void) _initialize_corelow (); _initialize_solib (); _initialize_svr4_solib (); + _initialize_svr4_lm (); _initialize_ser_hardwire (); _initialize_ser_pipe (); _initialize_ser_tcp (); Modified: stable/9/gnu/usr.bin/gdb/arch/powerpc64/Makefile ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/powerpc64/Makefile Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/powerpc64/Makefile Thu Oct 4 09:49:53 2012 (r241192) @@ -4,7 +4,7 @@ LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c LIBSRCS+= ppcfbsd-nat.c .endif -LIBSRCS+= solib.c solib-svr4.c +LIBSRCS+= solib.c solib-svr4.c solib-legacy.c LIBSRCS+= ppc-sysv-tdep.c ppcfbsd-tdep.c rs6000-tdep.c nm.h: Modified: stable/9/gnu/usr.bin/gdb/arch/powerpc64/init.c ============================================================================== --- stable/9/gnu/usr.bin/gdb/arch/powerpc64/init.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/gnu/usr.bin/gdb/arch/powerpc64/init.c Thu Oct 4 09:49:53 2012 (r241192) @@ -10,6 +10,7 @@ extern initialize_file_ftype _initialize extern initialize_file_ftype _initialize_corelow; extern initialize_file_ftype _initialize_solib; extern initialize_file_ftype _initialize_svr4_solib; +extern initialize_file_ftype _initialize_svr4_lm; extern initialize_file_ftype _initialize_ser_hardwire; extern initialize_file_ftype _initialize_ser_pipe; extern initialize_file_ftype _initialize_ser_tcp; @@ -122,6 +123,7 @@ initialize_all_files (void) _initialize_corelow (); _initialize_solib (); _initialize_svr4_solib (); + _initialize_svr4_lm (); _initialize_ser_hardwire (); _initialize_ser_pipe (); _initialize_ser_tcp (); Modified: stable/9/kerberos5/usr.bin/kadmin/Makefile ============================================================================== --- stable/9/kerberos5/usr.bin/kadmin/Makefile Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/kerberos5/usr.bin/kadmin/Makefile Thu Oct 4 09:49:53 2012 (r241192) @@ -29,11 +29,11 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DI DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \ ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD} + ${LIBEDIT} ${LIBNCURSES} ${LDAPDPADD} LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \ ${LIBSL} -lroken ${LIBVERS} -lasn1 \ -lcrypto -lcrypt -lcom_err \ - -lreadline -lncurses ${LDAPLDADD} + -ledit -lncurses ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include Modified: stable/9/kerberos5/usr.sbin/ktutil/Makefile ============================================================================== --- stable/9/kerberos5/usr.sbin/ktutil/Makefile Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/kerberos5/usr.sbin/ktutil/Makefile Thu Oct 4 09:49:53 2012 (r241192) @@ -18,10 +18,10 @@ SRCS= add.c \ CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I. DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBHX509} ${LIBSL} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBREADLINE} ${LIBNCURSES} + ${LIBEDIT} ${LIBNCURSES} LDADD= -lkadm5clnt -lkrb5 -lhx509 ${LIBSL} -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err \ - -lreadline -lncurses + -ledit -lncurses .include Modified: stable/9/rescue/rescue/Makefile ============================================================================== --- stable/9/rescue/rescue/Makefile Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/rescue/rescue/Makefile Thu Oct 4 09:49:53 2012 (r241192) @@ -123,9 +123,9 @@ CRUNCH_LIBS+= -lalias -lcam -lcurses -ld CRUNCH_LIBS+= -lipx .endif .if ${MK_ZFS} != "no" -CRUNCH_LIBS+= -lavl -lnvpair -lpthread -lzfs -luutil -lumem +CRUNCH_LIBS+= -lavl -lnvpair -lzfs -lpthread -luutil -lumem .endif -CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz +CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs -lz .if ${MACHINE_CPUARCH} == "i386" CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk Modified: stable/9/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- stable/9/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Oct 4 09:49:53 2012 (r241192) @@ -1357,7 +1357,9 @@ fr_info_t *fin; else sum = in_pseudo(ip->ip_src.s_addr, ip->ip_dst.s_addr, htonl(m->m_pkthdr.csum_data + - fin->fin_ip->ip_len + fin->fin_p)); + fin->fin_ip->ip_len - + (fin->fin_ip->ip_hl << 2) + + fin->fin_p)); sum ^= 0xffff; if (sum != 0) { fin->fin_flx |= FI_BAD; Modified: stable/9/sys/fs/ext2fs/ext2_bmap.c ============================================================================== --- stable/9/sys/fs/ext2fs/ext2_bmap.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/sys/fs/ext2fs/ext2_bmap.c Thu Oct 4 09:49:53 2012 (r241192) @@ -66,7 +66,6 @@ ext2_bmap(ap) int *a_runb; } */ *ap; { - int32_t blkno; int error; /* @@ -78,9 +77,8 @@ ext2_bmap(ap) if (ap->a_bnp == NULL) return (0); - error = ext2_bmaparray(ap->a_vp, ap->a_bn, &blkno, + error = ext2_bmaparray(ap->a_vp, ap->a_bn, ap->a_bnp, ap->a_runp, ap->a_runb); - *ap->a_bnp = blkno; return (error); } @@ -101,8 +99,8 @@ ext2_bmap(ap) int ext2_bmaparray(vp, bn, bnp, runp, runb) struct vnode *vp; - int32_t bn; - int32_t *bnp; + daddr_t bn; + daddr_t *bnp; int *runp; int *runb; { @@ -112,8 +110,8 @@ ext2_bmaparray(vp, bn, bnp, runp, runb) struct mount *mp; struct vnode *devvp; struct indir a[NIADDR+1], *ap; - int32_t daddr; - long metalbn; + daddr_t daddr; + daddr_t metalbn; int error, num, maxrun = 0, bsize; int *nump; @@ -147,7 +145,7 @@ ext2_bmaparray(vp, bn, bnp, runp, runb) if (*bnp == 0) { *bnp = -1; } else if (runp) { - int32_t bnb = bn; + daddr_t bnb = bn; for (++bn; bn < NDADDR && *runp < maxrun && is_sequential(ump, ip->i_db[bn - 1], ip->i_db[bn]); ++bn, ++*runp); Modified: stable/9/sys/fs/ext2fs/ext2_extern.h ============================================================================== --- stable/9/sys/fs/ext2fs/ext2_extern.h Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/sys/fs/ext2fs/ext2_extern.h Thu Oct 4 09:49:53 2012 (r241192) @@ -54,7 +54,7 @@ int ext2_blkatoff(struct vnode *, off_t, void ext2_blkfree(struct inode *, int32_t, long); int32_t ext2_blkpref(struct inode *, int32_t, int, int32_t *, int32_t); int ext2_bmap(struct vop_bmap_args *); -int ext2_bmaparray(struct vnode *, int32_t, int32_t *, int *, int *); +int ext2_bmaparray(struct vnode *, daddr_t, daddr_t *, int *, int *); void ext2_clusteracct(struct m_ext2fs *, char *, int, daddr_t, int); void ext2_dirbad(struct inode *ip, doff_t offset, char *how); void ext2_ei2i(struct ext2fs_dinode *, struct inode *); Modified: stable/9/sys/fs/ext2fs/ext2_vnops.c ============================================================================== --- stable/9/sys/fs/ext2fs/ext2_vnops.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/sys/fs/ext2fs/ext2_vnops.c Thu Oct 4 09:49:53 2012 (r241192) @@ -1429,29 +1429,28 @@ ext2_strategy(ap) struct vnode *vp = ap->a_vp; struct inode *ip; struct bufobj *bo; - int32_t blkno; int error; ip = VTOI(vp); if (vp->v_type == VBLK || vp->v_type == VCHR) panic("ext2_strategy: spec"); if (bp->b_blkno == bp->b_lblkno) { - error = ext2_bmaparray(vp, bp->b_lblkno, &blkno, NULL, NULL); - bp->b_blkno = blkno; + error = ext2_bmaparray(vp, bp->b_lblkno, &bp->b_blkno, NULL, NULL); if (error) { bp->b_error = error; bp->b_ioflags |= BIO_ERROR; bufdone(bp); return (0); } - if ((long)bp->b_blkno == -1) + if (bp->b_blkno == -1) vfs_bio_clrbuf(bp); } - if ((long)bp->b_blkno == -1) { + if (bp->b_blkno == -1) { bufdone(bp); return (0); } bp->b_iooffset = dbtob(bp->b_blkno); + printf("%s: bp->b_iooffset %lld, bp->b_blkno %lld\n", __func__, (long long) bp->b_iooffset, (long long) bp->b_blkno); bo = VFSTOEXT2(vp->v_mount)->um_bo; BO_STRATEGY(bo, bp); return (0); @@ -1752,6 +1751,7 @@ ext2_read(ap) if (bytesinfile < xfersize) xfersize = bytesinfile; + printf("%s: lbn %lld\n", __func__, (long long) lbn); if (lblktosize(fs, nextlbn) >= ip->i_size) error = bread(vp, lbn, size, NOCRED, &bp); else if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERR) == 0) Modified: stable/9/usr.bin/grep/util.c ============================================================================== --- stable/9/usr.bin/grep/util.c Thu Oct 4 09:02:38 2012 (r241191) +++ stable/9/usr.bin/grep/util.c Thu Oct 4 09:49:53 2012 (r241192) @@ -336,10 +336,6 @@ procline(struct str *l, int nottext) break; } - /* One pass if we are not recording matches */ - if ((color == NULL && !oflag) || qflag || lflag) - break; - if (st == (size_t)pmatch.rm_so) break; /* No matches */ }