PERFORCE change 162949 for review
Marko Zec
zec at FreeBSD.org
Thu May 28 17:11:10 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=162949
Change 162949 by zec at zec_amdx4 on 2009/05/28 17:10:41
IFC @ 162935
...just out of curiosity why vc2 build breaks in zfs...
Affected files ...
.. //depot/projects/vimage-commit/src/sys/arm/at91/ohci_atmelarm.c#4 delete
.. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#8 integrate
.. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/files.ixp425#4 integrate
.. //depot/projects/vimage-commit/src/sys/boot/common/ufsread.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/sys.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch
.. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/dev/lockstat/lockstat.c#1 branch
.. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_mib.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/compat/ndis/kern_ndis.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/conf/NOTES#19 integrate
.. //depot/projects/vimage-commit/src/sys/conf/files#27 integrate
.. //depot/projects/vimage-commit/src/sys/conf/files.i386#14 integrate
.. //depot/projects/vimage-commit/src/sys/conf/kern.pre.mk#7 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/crypto/via/padlock_hash.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/bktr/bktr_os.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_main.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ksyms/ksyms.c#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/mii/e1000phy.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/mii/e1000phyreg.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/mii/miidevs#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/msk/if_msk.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/msk/if_mskreg.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/nfe/if_nfe.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/random/nehemiah.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/random/randomdev_soft.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/sound/pci/cmi.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/sound/pci/cs4281.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/sound/pci/vibes.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/sound.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/sound.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/TODO.TXT#2 delete
.. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ng_ubt.c#4 delete
.. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete
.. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ubtbcmfw.c#4 delete
.. //depot/projects/vimage-commit/src/sys/dev/usb/input/ukbd.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_core.h#8 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.h#8 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_generic.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_util.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usbhid.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_urtw.c#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_urtwreg.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_urtwvar.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/xen/netfront/netfront.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonacl.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonport.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonsubs.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsport.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdsocket.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/fs/procfs/procfs_status.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/geom/geom_subr.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/i386/xen/xen_rtc.c#1 branch
.. //depot/projects/vimage-commit/src/sys/ia64/ia64/mp_machdep.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/kern/init_main.c#13 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_cpuset.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_descrip.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_fail.c#1 branch
.. //depot/projects/vimage-commit/src/sys/kern/kern_fork.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#16 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_linker.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_lock.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_lockf.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_lockstat.c#1 branch
.. //depot/projects/vimage-commit/src/sys/kern/kern_mib.c#14 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_mutex.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_proc.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_prot.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_rmlock.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_rwlock.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_sx.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/kern/link_elf.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/kern/link_elf_obj.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/kern/linker_if.m#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/sysv_msg.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/sysv_sem.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/kern/sysv_shm.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/kern/tty.c#15 integrate
.. //depot/projects/vimage-commit/src/sys/kern/uipc_debug.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#13 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_subr.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_syscalls.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/kgssapi/gsstest.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/legacy/dev/ata/ata-usb.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/FILES#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/dsbr100io.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehci.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehci_pci.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehcireg.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehcivar.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/hid.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/hid.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_urtw.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ohci.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ohci_pci.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ohcireg.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ohcivar.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/rio500_usb.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/sl811hs.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/u3g.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uark.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ubsa.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ubser.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ubser.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uchcom.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ucom.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ucomvar.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ucycom.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/udbp.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/udbp.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ufm.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ufoma.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uftdi.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uftdireg.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ugen.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhci.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhci_pci.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhcireg.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhcivar.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhid.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhub.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uipaq.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ukbd.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ulpt.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/umass.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/umct.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/umodem.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ums.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uplcom.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/urio.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_if.m#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_mem.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_mem.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_port.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_quirks.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_quirks.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_subr.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbcdc.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbdi.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbdi.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbdi_util.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbdi_util.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbdivar.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbhid.h#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uscanner.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uslcom.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uvisor.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uvscom.c#2 delete
.. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete
.. //depot/projects/vimage-commit/src/sys/mips/mips/pmap.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/modules/Makefile#18 integrate
.. //depot/projects/vimage-commit/src/sys/modules/dtrace/Makefile#4 integrate
.. //depot/projects/vimage-commit/src/sys/modules/dtrace/dtraceall/dtraceall.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/modules/ksyms/Makefile#1 branch
.. //depot/projects/vimage-commit/src/sys/modules/linux/Makefile#5 integrate
.. //depot/projects/vimage-commit/src/sys/modules/netgraph/bluetooth/ubt/Makefile#4 integrate
.. //depot/projects/vimage-commit/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#4 integrate
.. //depot/projects/vimage-commit/src/sys/modules/usb/Makefile#10 integrate
.. //depot/projects/vimage-commit/src/sys/modules/usb/urtw/Makefile#1 branch
.. //depot/projects/vimage-commit/src/sys/modules/zfs/Makefile#5 integrate
.. //depot/projects/vimage-commit/src/sys/net/bpf.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/net/rtsock.c#16 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_adhoc.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_hostap.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_monitor.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_radiotap.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_sta.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_wds.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/TODO#4 delete
.. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/accf_dns.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#17 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#19 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#15 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#18 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#16 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6.c#14 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#14 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_mcast.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#13 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#17 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#16 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/key.c#15 integrate
.. //depot/projects/vimage-commit/src/sys/netipx/spx.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/netipx/spx_reass.c#1 branch
.. //depot/projects/vimage-commit/src/sys/netipx/spx_usrreq.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netipx/spx_var.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_krpc.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_srvkrpc.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_srvsock.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/powerpc/booke/pmap.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/rpc/xdr.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/security/mac/mac_framework.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/security/mac/mac_internal.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/sys/cpuset.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/eventhandler.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/sys/fail.h#1 branch
.. //depot/projects/vimage-commit/src/sys/sys/jail.h#10 integrate
.. //depot/projects/vimage-commit/src/sys/sys/ksyms.h#1 branch
.. //depot/projects/vimage-commit/src/sys/sys/lock.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/sys/lockf.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/lockstat.h#1 branch
.. //depot/projects/vimage-commit/src/sys/sys/mutex.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/sys/namei.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/param.h#23 integrate
.. //depot/projects/vimage-commit/src/sys/sys/queue.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/rwlock.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/sx.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/syscallsubr.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/sys/systm.h#9 integrate
.. //depot/projects/vimage-commit/src/sys/sys/vimage.h#28 integrate
.. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_vnops.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/vm/vm_object.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/vm/vm_pageout.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/xdr/xdr_mem.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_xs.c#7 integrate
Differences ...
==== //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#8 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/AVILA,v 1.31 2009/05/10 00:00:25 kuriyama Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.32 2009/05/27 16:16:56 thompsa Exp $
ident AVILA
@@ -132,15 +132,14 @@
options AH_SUPPORT_AR5416
device ath_ar9160
-makeoptions WITH_LEGACY
-device ousb
+device usb
#options USB_DEBUG
-device oohci
-device oehci
-device oumass
+device ohci
+device ehci
+device umass
device scbus # SCSI bus (required for SCSI)
device da # Direct Access (disks)
-#device oural
-#device ozyd
+#device ural
+#device zyd
#device wlan_amrr
==== //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/files.ixp425#4 (text+ko) ====
@@ -1,4 +1,4 @@
-#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.10 2009/03/06 23:22:09 sam Exp $
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.11 2009/05/27 16:16:56 thompsa Exp $
arm/arm/bus_space_generic.c standard
arm/arm/cpufunc_asm_xscale.S standard
arm/arm/irq_dispatch.S standard
@@ -47,4 +47,3 @@
arm/xscale/ixp425/ixp425_qmgr.c optional qmgr
#
dev/usb/controller/ehci_ixp4xx.c optional ehci usb
-legacy/dev/usb/ehci_ixp4xx.c optional oehci ousb
==== //depot/projects/vimage-commit/src/sys/boot/common/ufsread.c#4 (text+ko) ====
@@ -44,9 +44,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.18 2008/06/07 05:49:24 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.19 2009/05/28 08:22:36 dfr Exp $");
#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
#include <ufs/ffs/fs.h>
#ifdef UFS_SMALL_CGBASE
/* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase
@@ -93,7 +94,7 @@
fsfind(const char *name, ino_t * ino)
{
char buf[DEV_BSIZE];
- struct dirent *d;
+ struct direct *d;
char *s;
ssize_t n;
@@ -104,7 +105,7 @@
if (ls)
printf("%s ", d->d_name);
else if (!strcmp(name, d->d_name)) {
- *ino = d->d_fileno;
+ *ino = d->d_ino;
return d->d_type;
}
s += d->d_reclen;
==== //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/sys.c#3 (text+ko) ====
@@ -27,14 +27,14 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.7 2005/05/08 14:17:27 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.8 2009/05/28 08:22:36 dfr Exp $");
/*
* Ported to PC-9801 by Yoshio Kimura
*/
#include "boot.h"
-#include <sys/dirent.h>
+#include <ufs/ufs/dir.h>
#if 0
/* #define BUFSIZE 4096 */
@@ -142,7 +142,7 @@
{
char *rest, ch;
int block, off, loc, ino = ROOTINO;
- struct dirent *dp;
+ struct direct *dp;
char list_only;
list_only = (path[0] == '?' && path[1] == '\0');
@@ -174,12 +174,12 @@
devread(iobuf, fsbtodb(fs, block_map(block)) + boff,
blksize(fs, &inode, block));
}
- dp = (struct dirent *)(iobuf + off);
+ dp = (struct direct *)(iobuf + off);
loc += dp->d_reclen;
- if (dp->d_fileno && list_only)
+ if (dp->d_ino && list_only)
printf("%s ", dp->d_name);
- } while (!dp->d_fileno || strcmp(path, dp->d_name));
- ino = dp->d_fileno;
+ } while (!dp->d_ino || strcmp(path, dp->d_name));
+ ino = dp->d_ino;
*(path = rest) = ch;
goto loop;
}
==== //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.6 2008/11/23 20:14:19 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.7 2009/05/24 19:21:49 trasz Exp $");
#include <sys/param.h>
#include <sys/priv.h>
@@ -302,6 +302,14 @@
if (error)
return (error);
}
+ /*
+ * Deny setting setuid if we are not the file owner.
+ */
+ if ((vap->va_mode & S_ISUID) && ovap->va_uid != cred->cr_uid) {
+ error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0);
+ if (error)
+ return (error);
+ }
return (0);
}
==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#5 (text+ko) ====
@@ -424,7 +424,7 @@
#endif
}
-#ifndef __FreeBSD__
+#if !defined(_KERNEL)
acl_t *
acl_alloc(enum acl_type type)
{
@@ -470,7 +470,6 @@
cacl_free(aclp, sizeof (acl_t));
}
-#endif
static uint32_t
access_mask_set(int haswriteperm, int hasreadperm, int isowner, int isallow)
@@ -1727,3 +1726,4 @@
return (error);
#endif
}
+#endif /* _KERNEL */
==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#4 (text+ko) ====
@@ -46,6 +46,7 @@
extern int ace_trivial_common(void *, int,
uint64_t (*walk)(void *, uint64_t, int aclcnt, uint16_t *, uint16_t *,
uint32_t *mask));
+#if !defined(_KERNEL)
extern acl_t *acl_alloc(acl_type_t);
extern void acl_free(acl_t *aclp);
extern int acl_translate(acl_t *aclp, int target_flavor,
@@ -53,6 +54,7 @@
void ksort(caddr_t v, int n, int s, int (*f)());
int cmp2acls(void *a, void *b);
+#endif /* _KERNEL */
#ifdef __cplusplus
}
==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.9 2008/11/05 19:39:11 rodrigc Exp $
+ * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.10 2009/05/26 20:28:22 sson Exp $
*/
/*
@@ -122,6 +122,7 @@
#include <sys/sysctl.h>
#include <sys/lock.h>
#include <sys/mutex.h>
+#include <sys/rwlock.h>
#include <sys/sx.h>
#include <sys/dtrace_bsd.h>
#include <netinet/in.h>
@@ -3168,14 +3169,11 @@
uintptr_t rw;
} r;
#else
+ struct thread *lowner;
union {
- struct mtx *mi;
- uintptr_t mx;
- } m;
- union {
- struct sx *si;
- uintptr_t sx;
- } s;
+ struct lock_object *li;
+ uintptr_t lx;
+ } l;
#endif
switch (subr) {
@@ -3272,75 +3270,83 @@
break;
#else
- /*
- * XXX - The following code works because mutex, rwlocks, & sxlocks
- * all have similar data structures in FreeBSD. This may not be
- * good if someone changes one of the lock data structures.
- * Ideally, it would be nice if all these shared a common lock
- * object.
- */
case DIF_SUBR_MUTEX_OWNED:
- /* XXX - need to use dtrace_canload() and dtrace_loadptr() */
- m.mx = tupregs[0].dttk_value;
-
-#ifdef DOODAD
- if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) {
- regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED);
- } else {
- regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED);
+ if (!dtrace_canload(tupregs[0].dttk_value,
+ sizeof (struct lock_object), mstate, vstate)) {
+ regs[rd] = 0;
+ break;
}
-#endif
+ l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value);
+ regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner);
break;
case DIF_SUBR_MUTEX_OWNER:
- /* XXX - need to use dtrace_canload() and dtrace_loadptr() */
- m.mx = tupregs[0].dttk_value;
-
- if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) {
- regs[rd] = m.mi->mtx_lock & ~MTX_FLAGMASK;
- } else {
- if (!(m.mi->mtx_lock & SX_LOCK_SHARED))
- regs[rd] = SX_OWNER(m.mi->mtx_lock);
- else
- regs[rd] = 0;
+ if (!dtrace_canload(tupregs[0].dttk_value,
+ sizeof (struct lock_object), mstate, vstate)) {
+ regs[rd] = 0;
+ break;
}
+ l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value);
+ LOCK_CLASS(l.li)->lc_owner(l.li, &lowner);
+ regs[rd] = (uintptr_t)lowner;
break;
case DIF_SUBR_MUTEX_TYPE_ADAPTIVE:
- /* XXX - need to use dtrace_canload() and dtrace_loadptr() */
- m.mx = tupregs[0].dttk_value;
-
- regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) != 0);
+ if (!dtrace_canload(tupregs[0].dttk_value, sizeof (struct mtx),
+ mstate, vstate)) {
+ regs[rd] = 0;
+ break;
+ }
+ l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value);
+ /* XXX - should be only LC_SLEEPABLE? */
+ regs[rd] = (LOCK_CLASS(l.li)->lc_flags &
+ (LC_SLEEPLOCK | LC_SLEEPABLE)) != 0;
break;
case DIF_SUBR_MUTEX_TYPE_SPIN:
- /* XXX - need to use dtrace_canload() and dtrace_loadptr() */
- m.mx = tupregs[0].dttk_value;
-
- regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) == 0);
+ if (!dtrace_canload(tupregs[0].dttk_value, sizeof (struct mtx),
+ mstate, vstate)) {
+ regs[rd] = 0;
+ break;
+ }
+ l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value);
+ regs[rd] = (LOCK_CLASS(l.li)->lc_flags & LC_SPINLOCK) != 0;
break;
case DIF_SUBR_RW_READ_HELD:
case DIF_SUBR_SX_SHARED_HELD:
- /* XXX - need to use dtrace_canload() and dtrace_loadptr() */
- s.sx = tupregs[0].dttk_value;
- regs[rd] = ((s.si->sx_lock & SX_LOCK_SHARED) &&
- (SX_OWNER(s.si->sx_lock) >> SX_SHARERS_SHIFT) != 0);
+ if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t),
+ mstate, vstate)) {
+ regs[rd] = 0;
+ break;
+ }
+ l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value);
+ regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner) &&
+ lowner == NULL;
break;
case DIF_SUBR_RW_WRITE_HELD:
case DIF_SUBR_SX_EXCLUSIVE_HELD:
- /* XXX - need to use dtrace_canload() and dtrace_loadptr() */
- s.sx = tupregs[0].dttk_value;
- regs[rd] = (SX_OWNER(s.si->sx_lock) == (uintptr_t) curthread);
+ if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t),
+ mstate, vstate)) {
+ regs[rd] = 0;
+ break;
+ }
+ l.lx = dtrace_loadptr(tupregs[0].dttk_value);
+ LOCK_CLASS(l.li)->lc_owner(l.li, &lowner);
+ regs[rd] = (lowner == curthread);
break;
case DIF_SUBR_RW_ISWRITER:
case DIF_SUBR_SX_ISEXCLUSIVE:
- /* XXX - need to use dtrace_canload() and dtrace_loadptr() */
- s.sx = tupregs[0].dttk_value;
- regs[rd] = ((s.si->sx_lock & SX_LOCK_EXCLUSIVE_WAITERS) ||
- !(s.si->sx_lock & SX_LOCK_SHARED));
+ if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t),
+ mstate, vstate)) {
+ regs[rd] = 0;
+ break;
+ }
+ l.lx = dtrace_loadptr(tupregs[0].dttk_value);
+ regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner) &&
+ lowner != NULL;
break;
#endif /* ! defined(sun) */
==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 (text+ko) ====
@@ -188,10 +188,8 @@
#ifdef _KERNEL
void zfs_perm_init(struct znode *, struct znode *, int, vattr_t *,
dmu_tx_t *, cred_t *, zfs_acl_t *, zfs_fuid_info_t **);
-#ifdef TODO
int zfs_getacl(struct znode *, vsecattr_t *, boolean_t, cred_t *);
int zfs_setacl(struct znode *, vsecattr_t *, boolean_t, cred_t *);
-#endif
void zfs_acl_rele(void *);
void zfs_oldace_byteswap(ace_t *, int);
void zfs_ace_byteswap(void *, size_t, boolean_t);
==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 (text+ko) ====
@@ -1909,7 +1909,6 @@
zfs_acl_free(aclp);
}
-#ifdef TODO
/*
* Retrieve a files ACL
*/
@@ -2005,7 +2004,6 @@
return (0);
}
-#endif /* TODO */
int
zfs_vsec_2_aclp(zfsvfs_t *zfsvfs, vtype_t obj_type,
@@ -2062,7 +2060,6 @@
return (0);
}
-#ifdef TODO
/*
* Set a files ACL
*/
@@ -2170,7 +2167,6 @@
return (error);
}
-#endif /* TODO */
/*
* working_mode returns the permissions that were not granted
==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 (text+ko) ====
@@ -45,7 +45,6 @@
#include <sys/errno.h>
#include <sys/unistd.h>
#include <sys/zfs_dir.h>
-#include <sys/zfs_acl.h>
#include <sys/zfs_ioctl.h>
#include <sys/fs/zfs.h>
#include <sys/dmu.h>
@@ -67,6 +66,7 @@
#include <sys/buf.h>
#include <sys/sf_buf.h>
#include <sys/sched.h>
+#include <sys/acl.h>
/*
* Programming rules.
@@ -3846,7 +3846,6 @@
}
}
-#ifdef TODO
/*ARGSUSED*/
static int
zfs_getsecattr(vnode_t *vp, vsecattr_t *vsecp, int flag, cred_t *cr,
@@ -3864,9 +3863,7 @@
return (error);
}
-#endif /* TODO */
-#ifdef TODO
/*ARGSUSED*/
static int
zfs_setsecattr(vnode_t *vp, vsecattr_t *vsecp, int flag, cred_t *cr,
@@ -3883,7 +3880,6 @@
ZFS_EXIT(zfsvfs);
return (error);
}
-#endif /* TODO */
static int
zfs_freebsd_open(ap)
@@ -3963,7 +3959,7 @@
zfs_freebsd_access(ap)
struct vop_access_args /* {
struct vnode *a_vp;
- int a_accmode;
+ accmode_t a_accmode;
struct ucred *a_cred;
struct thread *a_td;
} */ *ap;
@@ -4777,6 +4773,90 @@
return (error);
}
+int
+zfs_freebsd_getacl(ap)
+ struct vop_getacl_args /* {
+ struct vnode *vp;
+ acl_type_t type;
+ struct acl *aclp;
+ struct ucred *cred;
+ struct thread *td;
+ } */ *ap;
+{
+ int error;
+ vsecattr_t vsecattr;
+
+ if (ap->a_type != ACL_TYPE_NFS4)
+ return (EOPNOTSUPP);
+
+ vsecattr.vsa_mask = VSA_ACE | VSA_ACECNT;
+ if (error = zfs_getsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL))
+ return (error);
+
+ error = acl_from_aces(ap->a_aclp, vsecattr.vsa_aclentp, vsecattr.vsa_aclcnt);
+ if (vsecattr.vsa_aclentp != NULL)
+ kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz);
+
+ return (error);
+}
+
+int
+zfs_freebsd_setacl(ap)
+ struct vop_setacl_args /* {
+ struct vnode *vp;
+ acl_type_t type;
+ struct acl *aclp;
+ struct ucred *cred;
+ struct thread *td;
+ } */ *ap;
+{
+ int error;
+ vsecattr_t vsecattr;
+ int aclbsize; /* size of acl list in bytes */
+ aclent_t *aaclp;
+
+ if (ap->a_type != ACL_TYPE_NFS4)
+ return (EOPNOTSUPP);
+
+ if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES)
+ return (EINVAL);
+
+ /*
+ * With NFS4 ACLs, chmod(2) may need to add additional entries,
+ * splitting every entry into two and appending "canonical six"
+ * entries at the end. Don't allow for setting an ACL that would
+ * cause chmod(2) to run out of ACL entries.
+ */
+ if (ap->a_aclp->acl_cnt * 2 + 6 > ACL_MAX_ENTRIES)
+ return (ENOSPC);
+
+ vsecattr.vsa_mask = VSA_ACE;
+ aclbsize = ap->a_aclp->acl_cnt * sizeof(ace_t);
+ vsecattr.vsa_aclentp = kmem_alloc(aclbsize, KM_SLEEP);
+ aaclp = vsecattr.vsa_aclentp;
+ vsecattr.vsa_aclentsz = aclbsize;
+
+ aces_from_acl(vsecattr.vsa_aclentp, &vsecattr.vsa_aclcnt, ap->a_aclp);
+ error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL);
+ kmem_free(aaclp, aclbsize);
+
+ return (error);
+}
+
+int
+zfs_freebsd_aclcheck(ap)
+ struct vop_aclcheck_args /* {
+ struct vnode *vp;
+ acl_type_t type;
+ struct acl *aclp;
+ struct ucred *cred;
+ struct thread *td;
+ } */ *ap;
+{
+
+ return (EOPNOTSUPP);
+}
+
struct vop_vector zfs_vnodeops;
struct vop_vector zfs_fifoops;
@@ -4816,6 +4896,11 @@
.vop_deleteextattr = zfs_deleteextattr,
.vop_setextattr = zfs_setextattr,
.vop_listextattr = zfs_listextattr,
+#ifdef notyet
+ .vop_getacl = zfs_freebsd_getacl,
+ .vop_setacl = zfs_freebsd_setacl,
+ .vop_aclcheck = zfs_freebsd_aclcheck,
+#endif
};
struct vop_vector zfs_fifoops = {
@@ -4829,4 +4914,9 @@
.vop_setattr = zfs_freebsd_setattr,
.vop_write = VOP_PANIC,
.vop_fid = zfs_freebsd_fid,
+#ifdef notyet
+ .vop_getacl = zfs_freebsd_getacl,
+ .vop_setacl = zfs_freebsd_setacl,
+ .vop_aclcheck = zfs_freebsd_aclcheck,
+#endif
};
==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#4 (text+ko) ====
@@ -121,6 +121,7 @@
* Changes must be reviewed by Solaris File Sharing
* Changes must be communicated to contract-2003-523 at sun.com
*/
+#ifndef __FreeBSD__
struct xdr_ops {
#ifdef __STDC__
#if !defined(_KERNEL)
@@ -168,6 +169,28 @@
#endif
};
+#else /* FreeBSD */
+struct xdr_ops {
+ /* get a long from underlying stream */
+ bool_t (*x_getint32)(struct XDR *, int32_t *);
+ /* put a long to " */
+ bool_t (*x_putint32)(struct XDR *, const int32_t *);
+ /* get some bytes from " */
+ bool_t (*x_getbytes)(struct XDR *, char *, u_int);
+ /* put some bytes to " */
+ bool_t (*x_putbytes)(struct XDR *, const char *, u_int);
+ /* returns bytes off from beginning */
+ u_int (*x_getpostn)(struct XDR *);
+ /* lets you reposition the stream */
+ bool_t (*x_setpostn)(struct XDR *, u_int);
+ /* buf quick ptr to buffered data */
+ int32_t *(*x_inline)(struct XDR *, u_int);
+ /* free privates of this xdr_stream */
+ void (*x_destroy)(struct XDR *);
+ bool_t (*x_control)(struct XDR *, int, void *);
+};
+#endif
+
/*
* Operations defined on a XDR handle
*
==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 (text+ko) ====
@@ -31,12 +31,22 @@
#include <sys/types.h>
#include <sys/acl_impl.h>
+#if defined(_KERNEL)
+/*
+ * When compiling OpenSolaris kernel code, this file is getting
+ * included instead of FreeBSD one. Pull the original sys/acl.h as well.
+ */
+#undef _SYS_ACL_H
+#include_next <sys/acl.h>
+#define _SYS_ACL_H
+#endif /* _KERNEL */
+
#ifdef __cplusplus
extern "C" {
#endif
#define MAX_ACL_ENTRIES (1024) /* max entries of each type */
-typedef struct acl {
+typedef struct {
int a_type; /* the type of ACL entry */
uid_t a_id; /* the entry in -uid or gid */
o_mode_t a_perm; /* the permission field */
@@ -49,7 +59,9 @@
uint16_t a_type; /* allow or deny */
} ace_t;
+#if !defined(_KERNEL)
typedef struct acl_info acl_t;
+#endif
/*
* The following are Defined types for an aclent_t.
==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 (text+ko) ====
@@ -44,10 +44,10 @@
typedef enum acl_type {
ACLENT_T = 0,
ACE_T = 1
-} acl_type_t;
+} zfs_acl_type_t;
struct acl_info {
- acl_type_t acl_type; /* style of acl */
+ zfs_acl_type_t acl_type; /* style of acl */
int acl_cnt; /* number of acl entries */
int acl_entry_size; /* sizeof acl entry */
int acl_flags; /* special flags about acl */
==== //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_misc.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.89 2009/04/29 21:14:15 jamie Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.90 2009/05/27 14:11:23 jamie Exp $");
#include "opt_compat.h"
#include "opt_inet.h"
@@ -112,8 +112,6 @@
CTASSERT(sizeof(struct stat32) == 96);
CTASSERT(sizeof(struct sigaction32) == 24);
-extern int jail_max_af_ips;
-
static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count);
static int freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count);
@@ -2044,17 +2042,9 @@
int
freebsd32_jail(struct thread *td, struct freebsd32_jail_args *uap)
{
- struct iovec optiov[10];
- struct uio opt;
- char *u_path, *u_hostname, *u_name;
-#ifdef INET
- struct in_addr *u_ip4;
-#endif
-#ifdef INET6
- struct in6_addr *u_ip6;
-#endif
uint32_t version;
int error;
+ struct jail j;
error = copyin(uap->jail, &version, sizeof(uint32_t));
if (error)
@@ -2066,45 +2056,14 @@
/* FreeBSD single IPv4 jails. */
struct jail32_v0 j32_v0;
+ bzero(&j, sizeof(struct jail));
error = copyin(uap->jail, &j32_v0, sizeof(struct jail32_v0));
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list