From owner-p4-projects@FreeBSD.ORG Wed May 19 12:43:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF60516A4D1; Wed, 19 May 2004 12:43:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 792EC16A4CF for ; Wed, 19 May 2004 12:43:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7266843D2D for ; Wed, 19 May 2004 12:43:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4JJhXhn045855 for ; Wed, 19 May 2004 12:43:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4JJhX4R045846 for perforce@freebsd.org; Wed, 19 May 2004 12:43:33 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 19 May 2004 12:43:33 -0700 (PDT) Message-Id: <200405191943.i4JJhX4R045846@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 53071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2004 19:43:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=53071 Change 53071 by peter@peter_daintree on 2004/05/19 12:42:36 IFC @53068 Affected files ... .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#11 integrate .. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#6 integrate .. //depot/projects/hammer/sys/dev/iir/iir.c#8 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#7 integrate .. //depot/projects/hammer/sys/dev/iir/iir_ctrl.c#8 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#11 integrate Differences ... ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.13 2004/05/19 06:35:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.14 2004/05/19 17:09:24 kientzle Exp $"); #include #include @@ -764,21 +764,21 @@ struct stat *st, const void *h) { const struct archive_entry_header_ustar *header; + struct archive_string *as; header = h; /* Copy name into an internal buffer to ensure null-termination. */ + as = &(tar->entry_name); if (header->prefix[0]) { - archive_strncpy(&(tar->entry_name), header->prefix, - sizeof(header->prefix)); - archive_strappend_char(&(tar->entry_name), '/'); - archive_strncat(&(tar->entry_name), header->name, - sizeof(header->name)); + archive_strncpy(as, header->prefix, sizeof(header->prefix)); + if (as->s[archive_strlen(as) - 1] != '/') + archive_strappend_char(as, '/'); + archive_strncat(as, header->name, sizeof(header->name)); } else - archive_strncpy(&(tar->entry_name), header->name, - sizeof(header->name)); + archive_strncpy(as, header->name, sizeof(header->name)); - archive_entry_set_pathname(entry, tar->entry_name.s); + archive_entry_set_pathname(entry, as->s); /* Handle rest of common fields. */ header_common(a, tar, entry, st, h); ==== //depot/projects/hammer/lib/libkvm/kvm_amd64.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.16 2003/04/30 21:05:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.17 2004/05/19 18:24:13 peter Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 ==== //depot/projects/hammer/sys/dev/iir/iir.c#8 (text+ko) ==== @@ -1,7 +1,7 @@ /* - * Copyright (c) 2000-03 ICP vortex GmbH - * Copyright (c) 2002-03 Intel Corporation - * Copyright (c) 2003 Adaptec Inc. + * Copyright (c) 2000-04 ICP vortex GmbH + * Copyright (c) 2002-04 Intel Corporation + * Copyright (c) 2003-04 Adaptec Inc. * All Rights Reserved * * Redistribution and use in source and binary forms, with or without @@ -39,11 +39,11 @@ * Mike Smith; Some driver source code. * FreeBSD.ORG; Great O/S to work on and for. * - * $Id: iir.c 1.4 2003/08/26 12:29:44 achim Exp $" + * $Id: iir.c 1.5 2004/03/30 10:17:53 achim Exp $" */ #include -__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.9 2003/09/26 15:36:47 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.10 2004/05/19 17:46:34 scottl Exp $"); #define _IIR_C_ @@ -291,27 +291,12 @@ return (1); } - if (!gdt_internal_cmd(gdt, gccb, GDT_CACHESERVICE, GDT_INIT, - GDT_LINUX_OS, 0, 0)) { - printf("iir%d: Cache service initialization error %d\n", - gdt->sc_hanum, gdt->sc_status); - gdt_free_ccb(gdt, gccb); - return (1); - } gdt_internal_cmd(gdt, gccb, GDT_CACHESERVICE, GDT_UNFREEZE_IO, 0, 0, 0); - if (!gdt_internal_cmd(gdt, gccb, GDT_CACHESERVICE, GDT_MOUNT, - 0xffff, 1, 0)) { - printf("iir%d: Cache service mount error %d\n", - gdt->sc_hanum, gdt->sc_status); - gdt_free_ccb(gdt, gccb); - return (1); - } - if (!gdt_internal_cmd(gdt, gccb, GDT_CACHESERVICE, GDT_INIT, GDT_LINUX_OS, 0, 0)) { - printf("iir%d: Cache service post-mount initialization error %d\n", + printf("iir%d: Cache service initialization error %d\n", gdt->sc_hanum, gdt->sc_status); gdt_free_ccb(gdt, gccb); return (1); ==== //depot/projects/hammer/sys/dev/iir/iir.h#7 (text+ko) ==== @@ -1,8 +1,8 @@ -/* $FreeBSD: src/sys/dev/iir/iir.h,v 1.8 2004/03/20 19:02:46 scottl Exp $ */ +/* $FreeBSD: src/sys/dev/iir/iir.h,v 1.9 2004/05/19 17:46:34 scottl Exp $ */ /* - * Copyright (c) 2000-03 ICP vortex GmbH - * Copyright (c) 2002-03 Intel Corporation - * Copyright (c) 2003 Adaptec Inc. + * Copyright (c) 2000-04 ICP vortex GmbH + * Copyright (c) 2002-04 Intel Corporation + * Copyright (c) 2003-04 Adaptec Inc. * All Rights Reserved * * Redistribution and use in source and binary forms, with or without @@ -41,14 +41,14 @@ * credits: Niklas Hallqvist; OpenBSD driver for the ICP Controllers. * FreeBSD.ORG; Great O/S to work on and for. * - * $Id: iir.h 1.5 2003/08/26 12:28:21 achim Exp $" + * $Id: iir.h 1.6 2004/03/30 10:19:44 achim Exp $" */ #ifndef _IIR_H #define _IIR_H #define IIR_DRIVER_VERSION 1 -#define IIR_DRIVER_SUBVERSION 4 +#define IIR_DRIVER_SUBVERSION 5 /* OEM IDs */ #define OEM_ID_ICP 0x941c @@ -152,8 +152,10 @@ /* IOCTLs */ #define GDT_IOCTL_GENERAL _IOWR('J', 0, gdt_ucmd_t) /* general IOCTL */ -#define GDT_IOCTL_DRVERS _IOWR('J', 1, int) /* get driver version */ -#define GDT_IOCTL_CTRTYPE _IOR('J', 2, gdt_ctrt_t) /* get ctr. type */ +#define GDT_IOCTL_DRVERS _IOR('J', 1, int) /* get driver version */ +#define GDT_IOCTL_CTRTYPE _IOWR('J', 2, gdt_ctrt_t) /* get ctr. type */ +#define GDT_IOCTL_DRVERS_OLD _IOWR('J', 1, int) /* get driver version */ +#define GDT_IOCTL_CTRTYPE_OLD _IOR('J', 2, gdt_ctrt_t) /* get ctr. type */ #define GDT_IOCTL_OSVERS _IOR('J', 3, gdt_osv_t) /* get OS version */ #define GDT_IOCTL_CTRCNT _IOR('J', 5, int) /* get ctr. count */ #define GDT_IOCTL_EVENT _IOWR('J', 8, gdt_event_t) /* get event */ ==== //depot/projects/hammer/sys/dev/iir/iir_ctrl.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.13 2004/02/21 21:10:42 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.14 2004/05/19 17:46:34 scottl Exp $"); #include #include @@ -261,11 +261,13 @@ } case GDT_IOCTL_DRVERS: + case GDT_IOCTL_DRVERS_OLD: *(int *)cmdarg = (IIR_DRIVER_VERSION << 8) | IIR_DRIVER_SUBVERSION; break; case GDT_IOCTL_CTRTYPE: + case GDT_IOCTL_CTRTYPE_OLD: { gdt_ctrt_t *p; struct gdt_softc *gdt; ==== //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.119 2004/05/14 22:00:08 kensmith Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.120 2004/05/19 18:06:21 kensmith Exp $"); #include "opt_quota.h" @@ -261,8 +261,7 @@ allocbuf(bp, nsize); bp->b_flags |= B_DONE; if ((bp->b_flags & (B_MALLOC | B_VMIO)) != B_VMIO) - bzero((char *)bp->b_data + osize, - (u_int)nsize - osize); + bzero((char *)bp->b_data + osize, nsize - osize); else vfs_bio_clrbuf(bp); *bpp = bp; @@ -330,8 +329,7 @@ allocbuf(bp, nsize); bp->b_flags |= B_DONE; if ((bp->b_flags & (B_MALLOC | B_VMIO)) != B_VMIO) - bzero((char *)bp->b_data + osize, - (u_int)nsize - osize); + bzero((char *)bp->b_data + osize, nsize - osize); else vfs_bio_clrbuf(bp); *bpp = bp;