d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync to r201658 on head.

Browse Source
This commit is contained in:
Warner Losh 2010-01-06 18:21:22 +00:00
commit c0156af7e0
7 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/dumpfs/dumpfs.c
View File

@ -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;

2
sbin/geom/class/stripe/geom_stripe.c
View File

@ -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);

2
sys/dev/if_ndis/if_ndis.c
View File

@ -2243,7 +2243,7 @@ ndis_media_status(struct ifnet *ifp, struct ifmediareq *imr)
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;

8
sys/geom/geom_slice.c
View File

@ -393,10 +393,10 @@ g_slice_config(struct g_geom *gp, u_int idx, int how, off_t offset, off_t length
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,

9
sys/geom/part/g_part.c
View File

@ -288,11 +288,10 @@ g_part_new_provider(struct g_geom *gp, struct g_part_table *table,
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);
}

6
sys/geom/uzip/g_uzip.c
View File

@ -467,10 +467,8 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
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);

4
usr.bin/unzip/unzip.c
View File

@ -383,7 +383,7 @@ extract_dir(struct archive *a, struct archive_entry *e, const char *path)
{
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 archive_entry *e, const char *path)
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);