PERFORCE change 171446 for review
Alexander Motin
mav at FreeBSD.org
Sun Dec 6 11:25:48 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=171446
Change 171446 by mav at mav_mavbook on 2009/12/06 11:25:36
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/rescue/rescue/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/atacontrol/atacontrol.c#6 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.subdir.mk#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#64 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#44 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#38 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#43 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#27 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#27 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata_if.m#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acard.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-amd.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cenatek.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cypress.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cyrix.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-highpoint.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ite.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-micron.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-national.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-netcell.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-sis.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_dbdma.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_kauai.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_macio.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/psim/ata_iobus.c#7 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/w/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/w/w.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pw/pw_user.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/repquota/repquota.c#3 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/rescue/rescue/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-#$FreeBSD: src/rescue/rescue/Makefile,v 1.71 2009/06/24 18:21:37 jamie Exp $
+#$FreeBSD: src/rescue/rescue/Makefile,v 1.72 2009/12/05 23:23:46 ed Exp $
# @(#)Makefile 8.1 (Berkeley) 6/2/93
NO_MAN=
@@ -72,7 +72,7 @@
CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \
ed expr getfacl hostname kenv kill ln ls mkdir mv \
pkill ps pwd realpath rm rmdir setfacl sh stty sync test
-CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil
+CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lulog -lutil
# Additional options for specific programs
CRUNCH_ALIAS_test= [
==== //depot/projects/scottl-camlock/src/sbin/atacontrol/atacontrol.c#6 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.54 2009/11/26 12:41:43 mav Exp $
+ * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.55 2009/12/06 00:10:13 mav Exp $
*/
#include <sys/types.h>
==== //depot/projects/scottl-camlock/src/share/mk/bsd.subdir.mk#3 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
-# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.51 2007/12/07 15:02:06 ru Exp $
+# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.52 2009/12/06 08:59:19 ed Exp $
#
# The include file <bsd.subdir.mk> contains the default targets
# for building subdirectories.
@@ -24,9 +24,9 @@
# This is a variant of install, which will
# put the stuff into the right "distribution".
#
-# afterinstall, all, all-man, beforeinstall, checkdpadd,
-# clean, cleandepend, cleandir, depend, install, lint, maninstall,
-# manlint, obj, objlink, realinstall, regress, tags
+# afterinstall, all, all-man, beforeinstall, checkdpadd, clean,
+# cleandepend, cleandir, cleanilinks depend, install, lint,
+# maninstall, manlint, obj, objlink, realinstall, regress, tags
#
.include <bsd.init.mk>
@@ -66,9 +66,8 @@
${MAKE} all
.for __target in all all-man checkdpadd clean cleandepend cleandir \
- depend distribute lint maninstall manlint \
- obj objlink realinstall regress tags \
- ${SUBDIR_TARGETS}
+ cleanilinks depend distribute lint maninstall manlint obj objlink \
+ realinstall regress tags ${SUBDIR_TARGETS}
${__target}: _SUBDIR
.endfor
==== //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.2 2009/10/31 13:24:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.3 2009/12/06 00:10:13 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#64 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.16 2009/11/25 14:24:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.17 2009/12/06 00:10:13 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#33 (text+ko) ====
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.113 2009/12/02 16:08:33 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.114 2009/12/06 00:10:13 mav Exp $");
#include "opt_cd.h"
==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#44 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1565 2009/11/13 11:28:54 ed Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1566 2009/12/06 00:10:13 mav Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1718,9 +1718,15 @@
# else the device numbers are dynamically allocated.
# ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request
# before timing out.
+# ATA_CAM: Turn ata(4) subsystem controller drivers into cam(4)
+# interface modules. This deprecates all ata(4)
+# peripheral device drivers (atadisk, ataraid, atapicd,
+# atapifd. atapist, atapicam) and all user-level APIs.
+# cam(4) drivers and APIs will be connected instead.
options ATA_STATIC_ID
#options ATA_REQUEST_TIMEOUT=10
+#options ATA_CAM
#
# Standard floppy disk controllers and floppy tapes, supports
==== //depot/projects/scottl-camlock/src/sys/conf/options#38 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.697 2009/11/13 11:28:54 ed Exp $
+# $FreeBSD: src/sys/conf/options,v 1.698 2009/12/06 00:10:13 mav Exp $
#
# On the handling of kernel options
#
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#43 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.311 2009/11/26 12:41:43 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.312 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#27 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.149 2009/11/08 14:33:19 mav Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.150 2009/12/06 00:10:13 mav Exp $
*/
#if 0
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#23 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.220 2009/11/24 14:06:15 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.221 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#18 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.162 2009/10/31 13:24:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.163 2009/12/06 00:10:13 mav Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#18 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.85 2009/10/31 13:24:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.86 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#19 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.147 2009/12/05 13:40:51 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.148 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#27 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.115 2009/11/16 15:38:27 mav Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.116 2009/12/06 00:10:13 mav Exp $
*/
/* structure holding chipset config info */
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#26 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.89 2009/11/08 14:33:19 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.90 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-sata.c,v 1.7 2009/10/31 13:24:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-sata.c,v 1.8 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata_if.m#7 (text+ko) ====
@@ -22,7 +22,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/sys/dev/ata/ata_if.m,v 1.8 2008/04/10 13:05:05 sos Exp $
+# $FreeBSD: src/sys/dev/ata/ata_if.m,v 1.9 2009/12/06 00:10:13 mav Exp $
#include <sys/bus.h>
#include <sys/kernel.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#20 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.210 2009/11/08 14:33:19 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.211 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#14 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.120 2009/10/23 14:56:29 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.121 2009/12/06 00:10:13 mav Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#14 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.115 2009/10/23 14:56:29 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.116 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acard.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-acard.c,v 1.5 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-acard.c,v 1.6 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-acerlabs.c,v 1.8 2009/09/08 13:19:05 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-acerlabs.c,v 1.9 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.30 2009/12/05 10:30:54 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.31 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-amd.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-amd.c,v 1.2 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-amd.c,v 1.3 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ati.c,v 1.4 2009/10/05 16:26:54 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ati.c,v 1.5 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cenatek.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cenatek.c,v 1.2 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cenatek.c,v 1.3 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cypress.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cypress.c,v 1.2 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cypress.c,v 1.3 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cyrix.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cyrix.c,v 1.3 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cyrix.c,v 1.4 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-highpoint.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-highpoint.c,v 1.4 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-highpoint.c,v 1.5 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.9 2009/11/09 09:27:09 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.12 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ite.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ite.c,v 1.2 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ite.c,v 1.3 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-jmicron.c,v 1.7 2009/11/16 15:38:27 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-jmicron.c,v 1.8 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#20 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.17 2009/11/16 15:38:27 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.18 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-micron.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-micron.c,v 1.2 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-micron.c,v 1.3 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-national.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-national.c,v 1.3 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-national.c,v 1.4 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-netcell.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-netcell.c,v 1.4 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-netcell.c,v 1.5 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.11 2009/11/02 19:02:31 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.12 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.12 2009/10/31 13:24:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.13 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#12 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.8 2009/10/31 13:24:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.9 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.10 2009/11/01 13:06:15 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.11 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-sis.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-sis.c,v 1.7 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-sis.c,v 1.8 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-via.c,v 1.8 2009/10/26 10:07:52 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-via.c,v 1.9 2009/12/06 00:10:13 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#7 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_dummynet.c,v 1.8 2009/12/02 15:20:31 luigi Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_dummynet.c,v 1.9 2009/12/05 23:27:21 oleg Exp $");
#define DUMMYNET_DEBUG
@@ -1447,7 +1447,9 @@
q->numbytes += pipe->bandwidth;
}
} else { /* WF2Q. */
- if (pipe->idle_time < curr_time) {
+ if (pipe->idle_time < curr_time &&
+ pipe->scheduler_heap.elements == 0 &&
+ pipe->not_eligible_heap.elements == 0) {
/* Calculate available burst size. */
pipe->numbytes +=
(curr_time - pipe->idle_time - 1) * pipe->bandwidth;
==== //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_dbdma.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/powerpc/powermac/ata_dbdma.c,v 1.2 2008/10/28 22:09:30 nwhitehorn Exp $
+ * $FreeBSD: src/sys/powerpc/powermac/ata_dbdma.c,v 1.3 2009/12/06 00:10:13 mav Exp $
*/
/*
==== //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_kauai.c#8 (text+ko) ====
@@ -26,7 +26,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/powermac/ata_kauai.c,v 1.17 2008/10/27 00:09:14 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/powermac/ata_kauai.c,v 1.18 2009/12/06 00:10:13 mav Exp $");
/*
* Mac 'Kauai' PCI ATA controller
==== //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_macio.c#7 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/powerpc/powermac/ata_macio.c,v 1.22 2009/03/25 03:42:49 nwhitehorn Exp $
+ * $FreeBSD: src/sys/powerpc/powermac/ata_macio.c,v 1.23 2009/12/06 00:10:13 mav Exp $
*/
/*
==== //depot/projects/scottl-camlock/src/sys/powerpc/psim/ata_iobus.c#7 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/powerpc/psim/ata_iobus.c,v 1.15 2009/06/10 17:40:18 imp Exp $
+ * $FreeBSD: src/sys/powerpc/psim/ata_iobus.c,v 1.16 2009/12/06 00:10:13 mav Exp $
*/
/*
==== //depot/projects/scottl-camlock/src/usr.bin/w/Makefile#2 (text+ko) ====
@@ -1,11 +1,11 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD: src/usr.bin/w/Makefile,v 1.8 2001/07/26 19:20:13 brian Exp $
+# $FreeBSD: src/usr.bin/w/Makefile,v 1.9 2009/12/06 01:10:30 ed Exp $
PROG= w
SRCS= fmt.c pr_time.c proc_compare.c w.c
MAN= w.1 uptime.1
-DPADD= ${LIBKVM} ${LIBUTIL}
-LDADD= -lkvm -lutil
+DPADD= ${LIBKVM} ${LIBULOG} ${LIBUTIL}
+LDADD= -lkvm -lulog -lutil
#BINGRP= kmem
#BINMODE=2555
LINKS= ${BINDIR}/w ${BINDIR}/uptime
==== //depot/projects/scottl-camlock/src/usr.bin/w/w.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/w/w.c,v 1.62 2009/11/22 16:51:44 ume Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/w/w.c,v 1.63 2009/12/06 01:10:30 ed Exp $");
#ifndef lint
static const char copyright[] =
@@ -83,14 +83,15 @@
#include <stdlib.h>
#include <string.h>
#include <timeconv.h>
+#define _ULOG_POSIX_NAMES
+#include <ulog.h>
#include <unistd.h>
-#include <utmp.h>
#include <vis.h>
#include "extern.h"
struct timeval boottime;
-struct utmp utmp;
+struct utmpx *utmp;
struct winsize ws;
kvm_t *kd;
time_t now; /* the current time of day */
@@ -109,7 +110,7 @@
*/
struct entry {
struct entry *next;
- struct utmp utmp;
+ struct utmpx utmp;
dev_t tdev; /* dev_t of terminal */
time_t idle; /* idle time of terminal in seconds */
struct kinfo_proc *kp; /* `most interesting' proc */
@@ -119,11 +120,12 @@
#define debugproc(p) *((struct kinfo_proc **)&(p)->ki_udata)
-/* W_DISPHOSTSIZE should not be greater than UT_HOSTSIZE */
-#define W_DISPHOSTSIZE 16
+#define W_DISPUSERSIZE 10
+#define W_DISPLINESIZE 8
+#define W_DISPHOSTSIZE 24
static void pr_header(time_t *, int);
-static struct stat *ttystat(char *, int);
+static struct stat *ttystat(char *);
static void usage(int);
static int this_is_uptime(const char *s);
@@ -135,7 +137,6 @@
struct kinfo_proc *kp;
struct kinfo_proc *dkp;
struct stat *stp;
- FILE *ut;
time_t touched;
int ch, i, nentries, nusers, wcmd, longidle, longattime, dropgid;
const char *memf, *nlistf, *p;
@@ -208,16 +209,15 @@
errx(1, "%s", errbuf);
(void)time(&now);
- if ((ut = fopen(_PATH_UTMP, "r")) == NULL)
- err(1, "%s", _PATH_UTMP);
if (*argv)
sel_users = argv;
- for (nusers = 0; fread(&utmp, sizeof(utmp), 1, ut);) {
- if (utmp.ut_name[0] == '\0')
+ setutxent();
+ for (nusers = 0; (utmp = getutxent()) != NULL;) {
+ if (utmp->ut_type != USER_PROCESS)
continue;
- if (!(stp = ttystat(utmp.ut_line, UT_LINESIZE)))
+ if (!(stp = ttystat(utmp->ut_line)))
continue; /* corrupted record */
++nusers;
if (wcmd == 0)
@@ -228,7 +228,7 @@
usermatch = 0;
for (user = sel_users; !usermatch && *user; user++)
- if (!strncmp(utmp.ut_name, *user, UT_NAMESIZE))
+ if (!strcmp(utmp->ut_user, *user))
usermatch = 1;
if (!usermatch)
continue;
@@ -237,7 +237,7 @@
errx(1, "calloc");
*nextp = ep;
nextp = &ep->next;
- memmove(&ep->utmp, &utmp, sizeof(struct utmp));
+ memmove(&ep->utmp, utmp, sizeof *utmp);
ep->tdev = stp->st_rdev;
/*
* If this is the console device, attempt to ascertain
@@ -250,14 +250,14 @@
(void)sysctlbyname("machdep.consdev", &ep->tdev, &size, NULL, 0);
}
touched = stp->st_atime;
- if (touched < ep->utmp.ut_time) {
+ if (touched < ep->utmp.ut_tv.tv_sec) {
/* tty untouched since before login */
- touched = ep->utmp.ut_time;
+ touched = ep->utmp.ut_tv.tv_sec;
}
if ((ep->idle = now - touched) < 0)
ep->idle = 0;
}
- (void)fclose(ut);
+ endutxent();
if (header || wcmd == 0) {
pr_header(&now, nusers);
@@ -271,11 +271,11 @@
#define HEADER_FROM "FROM"
#define HEADER_LOGIN_IDLE "LOGIN@ IDLE "
#define HEADER_WHAT "WHAT\n"
-#define WUSED (UT_NAMESIZE + UT_LINESIZE + W_DISPHOSTSIZE + \
+#define WUSED (W_DISPUSERSIZE + W_DISPLINESIZE + W_DISPHOSTSIZE + \
sizeof(HEADER_LOGIN_IDLE) + 3) /* header width incl. spaces */
(void)printf("%-*.*s %-*.*s %-*.*s %s",
- UT_NAMESIZE, UT_NAMESIZE, HEADER_USER,
- UT_LINESIZE, UT_LINESIZE, HEADER_TTY,
+ W_DISPUSERSIZE, W_DISPUSERSIZE, HEADER_USER,
+ W_DISPLINESIZE, W_DISPLINESIZE, HEADER_TTY,
W_DISPHOSTSIZE, W_DISPHOSTSIZE, HEADER_FROM,
HEADER_LOGIN_IDLE HEADER_WHAT);
}
@@ -347,7 +347,6 @@
}
for (ep = ehead; ep != NULL; ep = ep->next) {
- char host_buf[UT_HOSTSIZE + 1];
struct addrinfo hints, *res;
struct sockaddr_storage ss;
struct sockaddr *sa = (struct sockaddr *)&ss;
@@ -356,9 +355,7 @@
time_t t;
int isaddr;
- host_buf[UT_HOSTSIZE] = '\0';
- strncpy(host_buf, ep->utmp.ut_host, UT_HOSTSIZE);
- p = *host_buf ? host_buf : "-";
+ p = *ep->utmp.ut_host ? ep->utmp.ut_host : "-";
if ((x_suffix = strrchr(p, ':')) != NULL) {
if ((dot = strchr(x_suffix, '.')) != NULL &&
strchr(dot+1, '.') == NULL)
@@ -419,13 +416,13 @@
}
}
(void)printf("%-*.*s %-*.*s %-*.*s ",
- UT_NAMESIZE, UT_NAMESIZE, ep->utmp.ut_name,
- UT_LINESIZE, UT_LINESIZE,
+ W_DISPUSERSIZE, W_DISPUSERSIZE, ep->utmp.ut_user,
+ W_DISPLINESIZE, W_DISPLINESIZE,
strncmp(ep->utmp.ut_line, "tty", 3) &&
strncmp(ep->utmp.ut_line, "cua", 3) ?
ep->utmp.ut_line : ep->utmp.ut_line + 3,
W_DISPHOSTSIZE, W_DISPHOSTSIZE, *p ? p : "-");
- t = _time_to_time32(ep->utmp.ut_time);
+ t = ep->utmp.ut_tv.tv_sec;
longattime = pr_attime(&t, &now);
longidle = pr_idle(ep->idle);
(void)printf("%.*s\n", argwidth - longidle - longattime,
@@ -496,12 +493,12 @@
}
static struct stat *
-ttystat(char *line, int sz)
+ttystat(char *line)
{
static struct stat sb;
char ttybuf[MAXPATHLEN];
- (void)snprintf(ttybuf, sizeof(ttybuf), "%s%.*s", _PATH_DEV, sz, line);
+ (void)snprintf(ttybuf, sizeof(ttybuf), "%s%s", _PATH_DEV, line);
if (stat(ttybuf, &sb) == 0) {
return (&sb);
} else
==== //depot/projects/scottl-camlock/src/usr.sbin/pw/pw_user.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/pw/pw_user.c,v 1.63 2008/08/16 15:41:03 ache Exp $";
+ "$FreeBSD: src/usr.sbin/pw/pw_user.c,v 1.64 2009/12/06 01:27:28 ed Exp $";
#endif /* not lint */
#include <ctype.h>
@@ -41,16 +41,11 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <unistd.h>
-#include <utmp.h>
#include <login_cap.h>
#include "pw.h"
#include "bitmap.h"
-#if (MAXLOGNAME-1) > UT_NAMESIZE
-#define LOGNAMESIZE UT_NAMESIZE
-#else
#define LOGNAMESIZE (MAXLOGNAME-1)
-#endif
static char locked_str[] = "*LOCKED*";
==== //depot/projects/scottl-camlock/src/usr.sbin/repquota/repquota.c#3 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/repquota/repquota.c,v 1.22 2008/07/02 15:51:59 des Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/repquota/repquota.c,v 1.23 2009/12/06 01:29:49 ed Exp $");
/*
* Quota report
@@ -60,7 +60,6 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
-#include <utmp.h>
/* Let's be paranoid about block size */
#if 10 > DEV_BSHIFT
@@ -227,9 +226,9 @@
}
fclose(qf);
printf("%*s Block limits File limits\n",
- max(UT_NAMESIZE,10), " ");
+ max(MAXLOGNAME-1,10), " ");
printf("%s%*s used soft hard grace used soft hard grace\n",
- type == USRQUOTA ? "User " : "Group", max(UT_NAMESIZE,10), " ");
+ type == USRQUOTA ? "User " : "Group", max(MAXLOGNAME-1,10), " ");
for (id = 0; id <= highid[type]; id++) {
fup = lookup(id, type);
if (fup == 0)
@@ -237,7 +236,7 @@
if (fup->fu_dqblk.dqb_curinodes == 0 &&
fup->fu_dqblk.dqb_curblocks == 0)
continue;
- printf("%-*s ", max(UT_NAMESIZE,10), fup->fu_name);
+ printf("%-*s ", max(MAXLOGNAME-1,10), fup->fu_name);
printf("%c%c %8lu %8lu %8lu %6s",
fup->fu_dqblk.dqb_bsoftlimit &&
fup->fu_dqblk.dqb_curblocks >=
More information about the p4-projects
mailing list