Date: Wed, 6 Jan 2010 18:21:22 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r201659 - in projects/mips: contrib/top sbin/dumpfs sbin/geom/class/stripe sys/dev/if_ndis sys/geom sys/geom/part sys/geom/uzip sys/mips/conf usr.bin/unzip Message-ID: <201001061821.o06ILMTb002577@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Jan 6 18:21:22 2010 New Revision: 201659 URL: http://svn.freebsd.org/changeset/base/201659 Log: Sync to r201658 on head. Modified: projects/mips/sbin/dumpfs/dumpfs.c projects/mips/sbin/geom/class/stripe/geom_stripe.c projects/mips/sys/dev/if_ndis/if_ndis.c projects/mips/sys/geom/geom_slice.c projects/mips/sys/geom/part/g_part.c projects/mips/sys/geom/uzip/g_uzip.c projects/mips/usr.bin/unzip/unzip.c Directory Properties: projects/mips/ (props changed) projects/mips/cddl/contrib/opensolaris/ (props changed) projects/mips/contrib/bind9/ (props changed) projects/mips/contrib/cpio/ (props changed) projects/mips/contrib/csup/ (props changed) projects/mips/contrib/ee/ (props changed) projects/mips/contrib/expat/ (props changed) projects/mips/contrib/file/ (props changed) projects/mips/contrib/gdb/ (props changed) projects/mips/contrib/gdtoa/ (props changed) projects/mips/contrib/less/ (props changed) projects/mips/contrib/libpcap/ (props changed) projects/mips/contrib/ncurses/ (props changed) projects/mips/contrib/netcat/ (props changed) projects/mips/contrib/ntp/ (props changed) projects/mips/contrib/openbsm/ (props changed) projects/mips/contrib/openpam/ (props changed) projects/mips/contrib/pf/ (props changed) projects/mips/contrib/sendmail/ (props changed) projects/mips/contrib/tcpdump/ (props changed) projects/mips/contrib/tcsh/ (props changed) projects/mips/contrib/top/ (props changed) projects/mips/contrib/top/install-sh (props changed) projects/mips/crypto/openssh/ (props changed) projects/mips/crypto/openssl/ (props changed) projects/mips/lib/libc/ (props changed) projects/mips/lib/libc/stdtime/ (props changed) projects/mips/lib/libutil/ (props changed) projects/mips/sbin/ (props changed) projects/mips/sbin/ipfw/ (props changed) projects/mips/share/zoneinfo/ (props changed) projects/mips/sys/ (props changed) projects/mips/sys/amd64/include/xen/ (props changed) projects/mips/sys/cddl/contrib/opensolaris/ (props changed) projects/mips/sys/contrib/dev/acpica/ (props changed) projects/mips/sys/contrib/pf/ (props changed) projects/mips/sys/dev/xen/xenpci/ (props changed) projects/mips/sys/mips/conf/OCTEON1 (props changed) projects/mips/sys/mips/octeon1/ (props changed) projects/mips/usr.bin/csup/ (props changed) projects/mips/usr.bin/procstat/ (props changed) projects/mips/usr.sbin/zic/ (props changed) Modified: projects/mips/sbin/dumpfs/dumpfs.c ============================================================================== --- projects/mips/sbin/dumpfs/dumpfs.c Wed Jan 6 17:12:18 2010 (r201658) +++ projects/mips/sbin/dumpfs/dumpfs.c Wed Jan 6 18:21:22 2010 (r201659) @@ -160,7 +160,7 @@ dumpfs(const char *name) fstime = afs.fs_old_time; printf("magic\t%x (UFS1)\ttime\t%s", afs.fs_magic, ctime(&fstime)); - printf("id\t[ %x %x ]\n", afs.fs_id[0], afs.fs_id[1]); + printf("id\t[ %08x %08x ]\n", afs.fs_id[0], afs.fs_id[1]); printf("ncg\t%d\tsize\t%jd\tblocks\t%jd\n", afs.fs_ncg, (intmax_t)fssize, (intmax_t)afs.fs_dsize); break; Modified: projects/mips/sbin/geom/class/stripe/geom_stripe.c ============================================================================== --- projects/mips/sbin/geom/class/stripe/geom_stripe.c Wed Jan 6 17:12:18 2010 (r201658) +++ projects/mips/sbin/geom/class/stripe/geom_stripe.c Wed Jan 6 18:21:22 2010 (r201659) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); uint32_t lib_version = G_LIB_VERSION; uint32_t version = G_STRIPE_VERSION; -static intmax_t default_stripesize = 4096; +static intmax_t default_stripesize = 65536; static void stripe_main(struct gctl_req *req, unsigned flags); static void stripe_clear(struct gctl_req *req); Modified: projects/mips/sys/dev/if_ndis/if_ndis.c ============================================================================== --- projects/mips/sys/dev/if_ndis/if_ndis.c Wed Jan 6 17:12:18 2010 (r201658) +++ projects/mips/sys/dev/if_ndis/if_ndis.c Wed Jan 6 18:21:22 2010 (r201659) @@ -2243,7 +2243,7 @@ ndis_media_status(struct ifnet *ifp, str struct ieee80211vap *vap = ifp->if_softc; struct ndis_softc *sc = vap->iv_ic->ic_ifp->if_softc; uint32_t txrate; - size_t len; + int len; if (!NDIS_INITIALIZED(sc)) return; Modified: projects/mips/sys/geom/geom_slice.c ============================================================================== --- projects/mips/sys/geom/geom_slice.c Wed Jan 6 17:12:18 2010 (r201658) +++ projects/mips/sys/geom/geom_slice.c Wed Jan 6 18:21:22 2010 (r201659) @@ -393,10 +393,10 @@ g_slice_config(struct g_geom *gp, u_int pp = g_new_providerf(gp, sbuf_data(sb)); pp2 = LIST_FIRST(&gp->consumer)->provider; pp->flags = pp2->flags & G_PF_CANDELETE; - if (pp2->stripesize > 0) { - pp->stripesize = pp2->stripesize; - pp->stripeoffset = (pp2->stripeoffset + offset) % pp->stripesize; - } + pp->stripesize = pp2->stripesize; + pp->stripeoffset = pp2->stripeoffset + offset; + if (pp->stripesize > 0) + pp->stripeoffset %= pp->stripesize; if (0 && bootverbose) printf("GEOM: Configure %s, start %jd length %jd end %jd\n", pp->name, (intmax_t)offset, (intmax_t)length, Modified: projects/mips/sys/geom/part/g_part.c ============================================================================== --- projects/mips/sys/geom/part/g_part.c Wed Jan 6 17:12:18 2010 (r201658) +++ projects/mips/sys/geom/part/g_part.c Wed Jan 6 18:21:22 2010 (r201659) @@ -288,11 +288,10 @@ g_part_new_provider(struct g_geom *gp, s entry->gpe_pp->mediasize -= entry->gpe_offset - offset; entry->gpe_pp->sectorsize = pp->sectorsize; entry->gpe_pp->flags = pp->flags & G_PF_CANDELETE; - if (pp->stripesize > 0) { - entry->gpe_pp->stripesize = pp->stripesize; - entry->gpe_pp->stripeoffset = (pp->stripeoffset + - entry->gpe_offset) % pp->stripesize; - } + entry->gpe_pp->stripesize = pp->stripesize; + entry->gpe_pp->stripeoffset = pp->stripeoffset + entry->gpe_offset; + if (pp->stripesize > 0) + entry->gpe_pp->stripeoffset %= pp->stripesize; g_error_provider(entry->gpe_pp, 0); } Modified: projects/mips/sys/geom/uzip/g_uzip.c ============================================================================== --- projects/mips/sys/geom/uzip/g_uzip.c Wed Jan 6 17:12:18 2010 (r201658) +++ projects/mips/sys/geom/uzip/g_uzip.c Wed Jan 6 18:21:22 2010 (r201659) @@ -467,10 +467,8 @@ g_uzip_taste(struct g_class *mp, struct pp2->sectorsize = 512; pp2->mediasize = (off_t)sc->nblocks * sc->blksz; pp2->flags = pp->flags & G_PF_CANDELETE; - if (pp->stripesize > 0) { - pp2->stripesize = pp->stripesize; - pp2->stripeoffset = pp->stripeoffset; - } + pp2->stripesize = pp->stripesize; + pp2->stripeoffset = pp->stripeoffset; g_error_provider(pp2, 0); g_access(cp, -1, 0, 0); Modified: projects/mips/usr.bin/unzip/unzip.c ============================================================================== --- projects/mips/usr.bin/unzip/unzip.c Wed Jan 6 17:12:18 2010 (r201658) +++ projects/mips/usr.bin/unzip/unzip.c Wed Jan 6 18:21:22 2010 (r201659) @@ -383,7 +383,7 @@ extract_dir(struct archive *a, struct ar { int mode; - mode = archive_entry_filetype(e) & 0777; + mode = archive_entry_mode(e) & 0777; if (mode == 0) mode = 0755; @@ -425,7 +425,7 @@ extract_file(struct archive *a, struct a ssize_t len; unsigned char *p, *q, *end; - mode = archive_entry_filetype(e) & 0777; + mode = archive_entry_mode(e) & 0777; if (mode == 0) mode = 0644; mtime = archive_entry_mtime(e);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001061821.o06ILMTb002577>