svn commit: r202690 - in projects/suj/7: . games/fortune
games/fortune/datfiles gnu/usr.bin/groff/tmac lib/libufs
sbin/fsck_ffs sbin/fsdb sbin/mount sbin/tunefs share/man/man4
share/man/man5 share/...
Jeff Roberson
jeff at FreeBSD.org
Wed Jan 20 10:21:05 UTC 2010
Author: jeff
Date: Wed Jan 20 10:21:04 2010
New Revision: 202690
URL: http://svn.freebsd.org/changeset/base/202690
Log:
- Merge SUJ from 8 to 7.
Added:
projects/suj/7/sbin/fsck_ffs/suj.c
- copied unchanged from r202688, projects/suj/8/sbin/fsck_ffs/suj.c
Modified:
projects/suj/7/lib/libufs/Makefile
projects/suj/7/lib/libufs/cgroup.c
projects/suj/7/lib/libufs/inode.c
projects/suj/7/lib/libufs/libufs.h
projects/suj/7/lib/libufs/sblock.c
projects/suj/7/lib/libufs/type.c
projects/suj/7/sbin/fsck_ffs/Makefile
projects/suj/7/sbin/fsck_ffs/fsck.h
projects/suj/7/sbin/fsck_ffs/gjournal.c
projects/suj/7/sbin/fsck_ffs/main.c
projects/suj/7/sbin/fsck_ffs/pass4.c
projects/suj/7/sbin/fsck_ffs/pass5.c
projects/suj/7/sbin/fsdb/fsdbutil.c
projects/suj/7/sbin/mount/mount.c
projects/suj/7/sbin/tunefs/tunefs.c
projects/suj/7/sys/kern/vfs_bio.c
projects/suj/7/sys/kern/vfs_subr.c
projects/suj/7/sys/sys/buf.h
projects/suj/7/sys/sys/mount.h
projects/suj/7/sys/sys/queue.h
projects/suj/7/sys/ufs/ffs/ffs_alloc.c
projects/suj/7/sys/ufs/ffs/ffs_balloc.c
projects/suj/7/sys/ufs/ffs/ffs_extern.h
projects/suj/7/sys/ufs/ffs/ffs_inode.c
projects/suj/7/sys/ufs/ffs/ffs_snapshot.c
projects/suj/7/sys/ufs/ffs/ffs_softdep.c
projects/suj/7/sys/ufs/ffs/ffs_subr.c
projects/suj/7/sys/ufs/ffs/ffs_vfsops.c
projects/suj/7/sys/ufs/ffs/ffs_vnops.c
projects/suj/7/sys/ufs/ffs/fs.h
projects/suj/7/sys/ufs/ffs/softdep.h
projects/suj/7/sys/ufs/ufs/dinode.h
projects/suj/7/sys/ufs/ufs/inode.h
projects/suj/7/sys/ufs/ufs/ufs_dirhash.c
projects/suj/7/sys/ufs/ufs/ufs_extern.h
projects/suj/7/sys/ufs/ufs/ufs_lookup.c
projects/suj/7/sys/ufs/ufs/ufs_vnops.c
projects/suj/7/sys/ufs/ufs/ufsmount.h
projects/suj/7/usr.sbin/makefs/ffs/ffs_bswap.c (contents, props changed)
Directory Properties:
projects/suj/7/ (props changed)
projects/suj/7/COPYRIGHT (props changed)
projects/suj/7/Makefile (props changed)
projects/suj/7/Makefile.inc1 (props changed)
projects/suj/7/ObsoleteFiles.inc (props changed)
projects/suj/7/UPDATING (props changed)
projects/suj/7/bin/ (props changed)
projects/suj/7/bin/chflags/ (props changed)
projects/suj/7/bin/chio/ (props changed)
projects/suj/7/bin/cp/ (props changed)
projects/suj/7/bin/csh/ (props changed)
projects/suj/7/bin/dd/ (props changed)
projects/suj/7/bin/df/ (props changed)
projects/suj/7/bin/ln/ (props changed)
projects/suj/7/bin/pax/ (props changed)
projects/suj/7/bin/ps/ (props changed)
projects/suj/7/bin/rm/ (props changed)
projects/suj/7/bin/sh/ (props changed)
projects/suj/7/cddl/compat/opensolaris/ (props changed)
projects/suj/7/cddl/contrib/opensolaris/ (props changed)
projects/suj/7/cddl/contrib/opensolaris/cmd/zdb/ (props changed)
projects/suj/7/cddl/contrib/opensolaris/cmd/zfs/ (props changed)
projects/suj/7/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/suj/7/cddl/lib/libnvpair/ (props changed)
projects/suj/7/contrib/ (props changed)
projects/suj/7/contrib/bind9/ (props changed)
projects/suj/7/contrib/bsnmp/ (props changed)
projects/suj/7/contrib/bzip2/ (props changed)
projects/suj/7/contrib/cpio/ (props changed)
projects/suj/7/contrib/csup/ (props changed)
projects/suj/7/contrib/expat/ (props changed)
projects/suj/7/contrib/file/ (props changed)
projects/suj/7/contrib/gcc/ (props changed)
projects/suj/7/contrib/gdb/ (props changed)
projects/suj/7/contrib/gdtoa/ (props changed)
projects/suj/7/contrib/groff/ (props changed)
projects/suj/7/contrib/ipfilter/ (props changed)
projects/suj/7/contrib/less/ (props changed)
projects/suj/7/contrib/libpcap/ (props changed)
projects/suj/7/contrib/ncurses/ (props changed)
projects/suj/7/contrib/netcat/ (props changed)
projects/suj/7/contrib/ntp/ (props changed)
projects/suj/7/contrib/one-true-awk/ (props changed)
projects/suj/7/contrib/openbsm/ (props changed)
projects/suj/7/contrib/openpam/ (props changed)
projects/suj/7/contrib/pf/ (props changed)
projects/suj/7/contrib/sendmail/ (props changed)
projects/suj/7/contrib/smbfs/ (props changed)
projects/suj/7/contrib/tcpdump/ (props changed)
projects/suj/7/contrib/tcsh/ (props changed)
projects/suj/7/contrib/telnet/ (props changed)
projects/suj/7/contrib/top/ (props changed)
projects/suj/7/contrib/traceroute/ (props changed)
projects/suj/7/crypto/heimdal/ (props changed)
projects/suj/7/crypto/openssh/ (props changed)
projects/suj/7/crypto/openssl/ (props changed)
projects/suj/7/etc/ (props changed)
projects/suj/7/etc/rc.d/ (props changed)
projects/suj/7/games/factor/ (props changed)
projects/suj/7/games/fortune/ (props changed)
projects/suj/7/games/fortune/Makefile (props changed)
projects/suj/7/games/fortune/Makefile.inc (props changed)
projects/suj/7/games/fortune/Notes (props changed)
projects/suj/7/games/fortune/README (props changed)
projects/suj/7/games/fortune/datfiles/ (props changed)
projects/suj/7/games/fortune/datfiles/freebsd-tips (props changed)
projects/suj/7/games/fortune/fortune/ (props changed)
projects/suj/7/games/fortune/strfile/ (props changed)
projects/suj/7/games/fortune/tools/ (props changed)
projects/suj/7/games/fortune/unstr/ (props changed)
projects/suj/7/gnu/ (props changed)
projects/suj/7/gnu/usr.bin/cc/ (props changed)
projects/suj/7/gnu/usr.bin/cvs/ (props changed)
projects/suj/7/gnu/usr.bin/gdb/kgdb/ (props changed)
projects/suj/7/gnu/usr.bin/grep/ (props changed)
projects/suj/7/gnu/usr.bin/groff/ (props changed)
projects/suj/7/gnu/usr.bin/groff/tmac/mdoc.local (props changed)
projects/suj/7/gnu/usr.bin/man/ (props changed)
projects/suj/7/gnu/usr.bin/patch/ (props changed)
projects/suj/7/gnu/usr.bin/sort/ (props changed)
projects/suj/7/include/ (props changed)
projects/suj/7/kerberos5/ (props changed)
projects/suj/7/lib/ (props changed)
projects/suj/7/lib/bind/ (props changed)
projects/suj/7/lib/csu/ (props changed)
projects/suj/7/lib/libarchive/ (props changed)
projects/suj/7/lib/libbluetooth/ (props changed)
projects/suj/7/lib/libc/ (props changed)
projects/suj/7/lib/libc/stdtime/ (props changed)
projects/suj/7/lib/libc_r/ (props changed)
projects/suj/7/lib/libcam/ (props changed)
projects/suj/7/lib/libdevinfo/ (props changed)
projects/suj/7/lib/libdisk/ (props changed)
projects/suj/7/lib/libdwarf/ (props changed)
projects/suj/7/lib/libelf/ (props changed)
projects/suj/7/lib/libexpat/ (props changed)
projects/suj/7/lib/libfetch/ (props changed)
projects/suj/7/lib/libftpio/ (props changed)
projects/suj/7/lib/libgeom/ (props changed)
projects/suj/7/lib/libgssapi/ (props changed)
projects/suj/7/lib/libkse/ (props changed)
projects/suj/7/lib/libkvm/ (props changed)
projects/suj/7/lib/libmagic/ (props changed)
projects/suj/7/lib/libmemstat/ (props changed)
projects/suj/7/lib/libpmc/ (props changed)
projects/suj/7/lib/libradius/ (props changed)
projects/suj/7/lib/libstand/ (props changed)
projects/suj/7/lib/libtacplus/ (props changed)
projects/suj/7/lib/libthr/ (props changed)
projects/suj/7/lib/libthread_db/ (props changed)
projects/suj/7/lib/libufs/ (props changed)
projects/suj/7/lib/libutil/ (props changed)
projects/suj/7/lib/msun/ (props changed)
projects/suj/7/libexec/ (props changed)
projects/suj/7/libexec/rpc.rquotad/ (props changed)
projects/suj/7/libexec/rpc.rstatd/ (props changed)
projects/suj/7/libexec/rtld-elf/ (props changed)
projects/suj/7/release/ (props changed)
projects/suj/7/release/doc/ (props changed)
projects/suj/7/release/doc/en_US.ISO8859-1/hardware/ (props changed)
projects/suj/7/rescue/ (props changed)
projects/suj/7/sbin/ (props changed)
projects/suj/7/sbin/atacontrol/ (props changed)
projects/suj/7/sbin/bsdlabel/ (props changed)
projects/suj/7/sbin/camcontrol/ (props changed)
projects/suj/7/sbin/clri/ (props changed)
projects/suj/7/sbin/ddb/ (props changed)
projects/suj/7/sbin/devd/ (props changed)
projects/suj/7/sbin/devfs/ (props changed)
projects/suj/7/sbin/dhclient/ (props changed)
projects/suj/7/sbin/dumpfs/ (props changed)
projects/suj/7/sbin/fdisk/ (props changed)
projects/suj/7/sbin/fdisk_pc98/ (props changed)
projects/suj/7/sbin/fsck/ (props changed)
projects/suj/7/sbin/fsck_ffs/ (props changed)
projects/suj/7/sbin/fsck_msdosfs/ (props changed)
projects/suj/7/sbin/geom/ (props changed)
projects/suj/7/sbin/geom/class/label/ (props changed)
projects/suj/7/sbin/geom/class/part/ (props changed)
projects/suj/7/sbin/geom/class/stripe/ (props changed)
projects/suj/7/sbin/geom/misc/ (props changed)
projects/suj/7/sbin/ifconfig/ (props changed)
projects/suj/7/sbin/init/ (props changed)
projects/suj/7/sbin/ipf/ (props changed)
projects/suj/7/sbin/ipfw/ (props changed)
projects/suj/7/sbin/md5/ (props changed)
projects/suj/7/sbin/mdconfig/ (props changed)
projects/suj/7/sbin/mksnap_ffs/ (props changed)
projects/suj/7/sbin/mount/ (props changed)
projects/suj/7/sbin/mount/mount_fs.c (props changed)
projects/suj/7/sbin/mount_cd9660/ (props changed)
projects/suj/7/sbin/mount_msdosfs/ (props changed)
projects/suj/7/sbin/mount_nfs/ (props changed)
projects/suj/7/sbin/natd/ (props changed)
projects/suj/7/sbin/newfs_msdos/ (props changed)
projects/suj/7/sbin/ping6/ (props changed)
projects/suj/7/sbin/restore/ (props changed)
projects/suj/7/sbin/route/ (props changed)
projects/suj/7/sbin/savecore/ (props changed)
projects/suj/7/sbin/sconfig/ (props changed)
projects/suj/7/sbin/shutdown/ (props changed)
projects/suj/7/sbin/umount/ (props changed)
projects/suj/7/secure/lib/libssh/ (props changed)
projects/suj/7/secure/libexec/sftp-server/ (props changed)
projects/suj/7/secure/usr.bin/bdes/ (props changed)
projects/suj/7/secure/usr.bin/ssh/ (props changed)
projects/suj/7/secure/usr.sbin/sshd/ (props changed)
projects/suj/7/share/ (props changed)
projects/suj/7/share/colldef/ (props changed)
projects/suj/7/share/doc/bind9/ (props changed)
projects/suj/7/share/examples/ (props changed)
projects/suj/7/share/man/ (props changed)
projects/suj/7/share/man/man3/ (props changed)
projects/suj/7/share/man/man4/ (props changed)
projects/suj/7/share/man/man4/de.4 (props changed)
projects/suj/7/share/man/man5/ (props changed)
projects/suj/7/share/man/man5/rc.conf.5 (props changed)
projects/suj/7/share/man/man7/ (props changed)
projects/suj/7/share/man/man8/ (props changed)
projects/suj/7/share/man/man9/ (props changed)
projects/suj/7/share/misc/ (props changed)
projects/suj/7/share/misc/iso639 (props changed)
projects/suj/7/share/misc/pci_vendors (props changed)
projects/suj/7/share/mk/ (props changed)
projects/suj/7/share/mklocale/ (props changed)
projects/suj/7/share/monetdef/ (props changed)
projects/suj/7/share/msgdef/ (props changed)
projects/suj/7/share/numericdef/ (props changed)
projects/suj/7/share/sendmail/ (props changed)
projects/suj/7/share/syscons/ (props changed)
projects/suj/7/share/syscons/keymaps/ (props changed)
projects/suj/7/share/termcap/ (props changed)
projects/suj/7/share/timedef/ (props changed)
projects/suj/7/share/zoneinfo/ (props changed)
projects/suj/7/sys/ (props changed)
projects/suj/7/sys/cddl/contrib/opensolaris/ (props changed)
projects/suj/7/sys/contrib/dev/acpica/ (props changed)
projects/suj/7/sys/contrib/pf/ (props changed)
projects/suj/7/tools/build/ (props changed)
projects/suj/7/tools/kerneldoc/subsys/ (props changed)
projects/suj/7/tools/regression/atm/ (props changed)
projects/suj/7/tools/regression/bin/sh/ (props changed)
projects/suj/7/tools/regression/file/ (props changed)
projects/suj/7/tools/regression/file/flock/ (props changed)
projects/suj/7/tools/regression/lib/libc/ (props changed)
projects/suj/7/tools/regression/priv/ (props changed)
projects/suj/7/tools/regression/usr.bin/ (props changed)
projects/suj/7/tools/regression/usr.bin/jot/ (props changed)
projects/suj/7/tools/regression/usr.bin/tr/ (props changed)
projects/suj/7/tools/sched/ (props changed)
projects/suj/7/tools/tools/crypto/ (props changed)
projects/suj/7/tools/tools/editing/ (props changed)
projects/suj/7/tools/tools/nanobsd/ (props changed)
projects/suj/7/tools/tools/nanobsd/FlashDevice.sub (props changed)
projects/suj/7/tools/tools/nanobsd/nanobsd.sh (props changed)
projects/suj/7/tools/tools/usb/ (props changed)
projects/suj/7/usr.bin/ (props changed)
projects/suj/7/usr.bin/awk/ (props changed)
projects/suj/7/usr.bin/basename/ (props changed)
projects/suj/7/usr.bin/bluetooth/rfcomm_sppd/ (props changed)
projects/suj/7/usr.bin/calendar/ (props changed)
projects/suj/7/usr.bin/calendar/calendars/ (props changed)
projects/suj/7/usr.bin/calendar/calendars/calendar.freebsd (props changed)
projects/suj/7/usr.bin/catman/ (props changed)
projects/suj/7/usr.bin/cksum/ (props changed)
projects/suj/7/usr.bin/comm/ (props changed)
projects/suj/7/usr.bin/cpuset/ (props changed)
projects/suj/7/usr.bin/csup/ (props changed)
projects/suj/7/usr.bin/dirname/ (props changed)
projects/suj/7/usr.bin/du/ (props changed)
projects/suj/7/usr.bin/fetch/ (props changed)
projects/suj/7/usr.bin/file/ (props changed)
projects/suj/7/usr.bin/find/ (props changed)
projects/suj/7/usr.bin/finger/ (props changed)
projects/suj/7/usr.bin/fstat/ (props changed)
projects/suj/7/usr.bin/gcore/ (props changed)
projects/suj/7/usr.bin/gprof/ (props changed)
projects/suj/7/usr.bin/gzip/ (props changed)
projects/suj/7/usr.bin/id/ (props changed)
projects/suj/7/usr.bin/ipcrm/ (props changed)
projects/suj/7/usr.bin/ipcs/ (props changed)
projects/suj/7/usr.bin/jot/ (props changed)
projects/suj/7/usr.bin/kdump/ (props changed)
projects/suj/7/usr.bin/ktrace/ (props changed)
projects/suj/7/usr.bin/ldd/ (props changed)
projects/suj/7/usr.bin/locale/ (props changed)
projects/suj/7/usr.bin/locate/ (props changed)
projects/suj/7/usr.bin/lockf/ (props changed)
projects/suj/7/usr.bin/logger/ (props changed)
projects/suj/7/usr.bin/look/ (props changed)
projects/suj/7/usr.bin/make/ (props changed)
projects/suj/7/usr.bin/ncal/ (props changed)
projects/suj/7/usr.bin/netstat/ (props changed)
projects/suj/7/usr.bin/newgrp/ (props changed)
projects/suj/7/usr.bin/nsupdate/ (props changed)
projects/suj/7/usr.bin/procstat/ (props changed)
projects/suj/7/usr.bin/quota/ (props changed)
projects/suj/7/usr.bin/rpcgen/ (props changed)
projects/suj/7/usr.bin/sed/ (props changed)
projects/suj/7/usr.bin/shar/ (props changed)
projects/suj/7/usr.bin/sockstat/ (props changed)
projects/suj/7/usr.bin/stat/ (props changed)
projects/suj/7/usr.bin/su/ (props changed)
projects/suj/7/usr.bin/systat/ (props changed)
projects/suj/7/usr.bin/tail/ (props changed)
projects/suj/7/usr.bin/tar/ (props changed)
projects/suj/7/usr.bin/tftp/ (props changed)
projects/suj/7/usr.bin/tip/ (props changed)
projects/suj/7/usr.bin/top/ (props changed)
projects/suj/7/usr.bin/truncate/ (props changed)
projects/suj/7/usr.bin/truss/ (props changed)
projects/suj/7/usr.bin/unifdef/ (props changed)
projects/suj/7/usr.bin/units/ (props changed)
projects/suj/7/usr.bin/vmstat/ (props changed)
projects/suj/7/usr.bin/w/ (props changed)
projects/suj/7/usr.bin/wc/ (props changed)
projects/suj/7/usr.bin/whereis/ (props changed)
projects/suj/7/usr.bin/whois/ (props changed)
projects/suj/7/usr.bin/xargs/ (props changed)
projects/suj/7/usr.bin/ypcat/ (props changed)
projects/suj/7/usr.bin/ypmatch/ (props changed)
projects/suj/7/usr.bin/ypwhich/ (props changed)
projects/suj/7/usr.sbin/ (props changed)
projects/suj/7/usr.sbin/IPXrouted/ (props changed)
projects/suj/7/usr.sbin/Makefile (props changed)
projects/suj/7/usr.sbin/Makefile.inc (props changed)
projects/suj/7/usr.sbin/ac/ (props changed)
projects/suj/7/usr.sbin/accton/ (props changed)
projects/suj/7/usr.sbin/acpi/ (props changed)
projects/suj/7/usr.sbin/adduser/ (props changed)
projects/suj/7/usr.sbin/amd/ (props changed)
projects/suj/7/usr.sbin/ancontrol/ (props changed)
projects/suj/7/usr.sbin/apm/ (props changed)
projects/suj/7/usr.sbin/apmd/ (props changed)
projects/suj/7/usr.sbin/arlcontrol/ (props changed)
projects/suj/7/usr.sbin/arp/ (props changed)
projects/suj/7/usr.sbin/asf/ (props changed)
projects/suj/7/usr.sbin/audit/ (props changed)
projects/suj/7/usr.sbin/auditd/ (props changed)
projects/suj/7/usr.sbin/auditreduce/ (props changed)
projects/suj/7/usr.sbin/authpf/ (props changed)
projects/suj/7/usr.sbin/bluetooth/ (props changed)
projects/suj/7/usr.sbin/bluetooth/btpand/ (props changed)
projects/suj/7/usr.sbin/bluetooth/hcsecd/ (props changed)
projects/suj/7/usr.sbin/bluetooth/hcseriald/ (props changed)
projects/suj/7/usr.sbin/bluetooth/rfcomm_pppd/ (props changed)
projects/suj/7/usr.sbin/bluetooth/sdpd/ (props changed)
projects/suj/7/usr.sbin/boot0cfg/ (props changed)
projects/suj/7/usr.sbin/boot98cfg/ (props changed)
projects/suj/7/usr.sbin/bootparamd/ (props changed)
projects/suj/7/usr.sbin/bsnmpd/ (props changed)
projects/suj/7/usr.sbin/bsnmpd/modules/snmp_pf/ (props changed)
projects/suj/7/usr.sbin/btxld/ (props changed)
projects/suj/7/usr.sbin/burncd/ (props changed)
projects/suj/7/usr.sbin/cdcontrol/ (props changed)
projects/suj/7/usr.sbin/chkgrp/ (props changed)
projects/suj/7/usr.sbin/chown/ (props changed)
projects/suj/7/usr.sbin/chroot/ (props changed)
projects/suj/7/usr.sbin/ckdist/ (props changed)
projects/suj/7/usr.sbin/clear_locks/ (props changed)
projects/suj/7/usr.sbin/config/ (props changed)
projects/suj/7/usr.sbin/cpucontrol/ (props changed)
projects/suj/7/usr.sbin/crashinfo/ (props changed)
projects/suj/7/usr.sbin/cron/ (props changed)
projects/suj/7/usr.sbin/cron/cron/ (props changed)
projects/suj/7/usr.sbin/crunch/ (props changed)
projects/suj/7/usr.sbin/ctm/ (props changed)
projects/suj/7/usr.sbin/cxgbtool/ (props changed)
projects/suj/7/usr.sbin/daemon/ (props changed)
projects/suj/7/usr.sbin/dconschat/ (props changed)
projects/suj/7/usr.sbin/devinfo/ (props changed)
projects/suj/7/usr.sbin/digictl/ (props changed)
projects/suj/7/usr.sbin/diskinfo/ (props changed)
projects/suj/7/usr.sbin/dnssec-keygen/ (props changed)
projects/suj/7/usr.sbin/dnssec-signzone/ (props changed)
projects/suj/7/usr.sbin/editmap/ (props changed)
projects/suj/7/usr.sbin/edquota/ (props changed)
projects/suj/7/usr.sbin/eeprom/ (props changed)
projects/suj/7/usr.sbin/extattr/ (props changed)
projects/suj/7/usr.sbin/extattrctl/ (props changed)
projects/suj/7/usr.sbin/faithd/ (props changed)
projects/suj/7/usr.sbin/fdcontrol/ (props changed)
projects/suj/7/usr.sbin/fdformat/ (props changed)
projects/suj/7/usr.sbin/fdread/ (props changed)
projects/suj/7/usr.sbin/fdwrite/ (props changed)
projects/suj/7/usr.sbin/fifolog/ (props changed)
projects/suj/7/usr.sbin/flowctl/ (props changed)
projects/suj/7/usr.sbin/freebsd-update/ (props changed)
projects/suj/7/usr.sbin/ftp-proxy/ (props changed)
projects/suj/7/usr.sbin/fwcontrol/ (props changed)
projects/suj/7/usr.sbin/getfmac/ (props changed)
projects/suj/7/usr.sbin/getpmac/ (props changed)
projects/suj/7/usr.sbin/gstat/ (props changed)
projects/suj/7/usr.sbin/i4b/ (props changed)
projects/suj/7/usr.sbin/ifmcstat/ (props changed)
projects/suj/7/usr.sbin/inetd/ (props changed)
projects/suj/7/usr.sbin/iostat/ (props changed)
projects/suj/7/usr.sbin/ip6addrctl/ (props changed)
projects/suj/7/usr.sbin/ipfwpcap/ (props changed)
projects/suj/7/usr.sbin/jail/ (props changed)
projects/suj/7/usr.sbin/jexec/ (props changed)
projects/suj/7/usr.sbin/jls/ (props changed)
projects/suj/7/usr.sbin/kbdcontrol/ (props changed)
projects/suj/7/usr.sbin/kbdmap/ (props changed)
projects/suj/7/usr.sbin/kernbb/ (props changed)
projects/suj/7/usr.sbin/keyserv/ (props changed)
projects/suj/7/usr.sbin/kgmon/ (props changed)
projects/suj/7/usr.sbin/kgzip/ (props changed)
projects/suj/7/usr.sbin/kldxref/ (props changed)
projects/suj/7/usr.sbin/lastlogin/ (props changed)
projects/suj/7/usr.sbin/lmcconfig/ (props changed)
projects/suj/7/usr.sbin/lpr/ (props changed)
projects/suj/7/usr.sbin/lptcontrol/ (props changed)
projects/suj/7/usr.sbin/mailstats/ (props changed)
projects/suj/7/usr.sbin/mailwrapper/ (props changed)
projects/suj/7/usr.sbin/makefs/ (props changed)
projects/suj/7/usr.sbin/makefs/ffs/ffs_subr.c (props changed)
projects/suj/7/usr.sbin/makefs/ffs/ufs_bswap.h (props changed)
projects/suj/7/usr.sbin/makefs/getid.c (props changed)
projects/suj/7/usr.sbin/makemap/ (props changed)
projects/suj/7/usr.sbin/manctl/ (props changed)
projects/suj/7/usr.sbin/memcontrol/ (props changed)
projects/suj/7/usr.sbin/mergemaster/ (props changed)
projects/suj/7/usr.sbin/mfiutil/ (props changed)
projects/suj/7/usr.sbin/mfiutil/mfiutil.8 (props changed)
projects/suj/7/usr.sbin/mixer/ (props changed)
projects/suj/7/usr.sbin/mld6query/ (props changed)
projects/suj/7/usr.sbin/mlxcontrol/ (props changed)
projects/suj/7/usr.sbin/mount_nwfs/ (props changed)
projects/suj/7/usr.sbin/mount_portalfs/ (props changed)
projects/suj/7/usr.sbin/mount_smbfs/ (props changed)
projects/suj/7/usr.sbin/mountd/ (props changed)
projects/suj/7/usr.sbin/moused/ (props changed)
projects/suj/7/usr.sbin/mptable/ (props changed)
projects/suj/7/usr.sbin/mptutil/ (props changed)
projects/suj/7/usr.sbin/mtest/ (props changed)
projects/suj/7/usr.sbin/mtree/ (props changed)
projects/suj/7/usr.sbin/named/ (props changed)
projects/suj/7/usr.sbin/named-checkconf/ (props changed)
projects/suj/7/usr.sbin/named-checkzone/ (props changed)
projects/suj/7/usr.sbin/named.reload/ (props changed)
projects/suj/7/usr.sbin/ndiscvt/ (props changed)
projects/suj/7/usr.sbin/ndp/ (props changed)
projects/suj/7/usr.sbin/newsyslog/ (props changed)
projects/suj/7/usr.sbin/newsyslog/newsyslog.conf.5 (props changed)
projects/suj/7/usr.sbin/nfsd/ (props changed)
projects/suj/7/usr.sbin/ngctl/ (props changed)
projects/suj/7/usr.sbin/nghook/ (props changed)
projects/suj/7/usr.sbin/nologin/ (props changed)
projects/suj/7/usr.sbin/nscd/ (props changed)
projects/suj/7/usr.sbin/ntp/ (props changed)
projects/suj/7/usr.sbin/nvram/ (props changed)
projects/suj/7/usr.sbin/ofwdump/ (props changed)
projects/suj/7/usr.sbin/pccard/ (props changed)
projects/suj/7/usr.sbin/pciconf/ (props changed)
projects/suj/7/usr.sbin/periodic/ (props changed)
projects/suj/7/usr.sbin/pkg_install/ (props changed)
projects/suj/7/usr.sbin/pmcannotate/ (props changed)
projects/suj/7/usr.sbin/pmccontrol/ (props changed)
projects/suj/7/usr.sbin/pmcstat/ (props changed)
projects/suj/7/usr.sbin/pnpinfo/ (props changed)
projects/suj/7/usr.sbin/portsnap/ (props changed)
projects/suj/7/usr.sbin/powerd/ (props changed)
projects/suj/7/usr.sbin/ppp/ (props changed)
projects/suj/7/usr.sbin/pppctl/ (props changed)
projects/suj/7/usr.sbin/pppd/ (props changed)
projects/suj/7/usr.sbin/pppstats/ (props changed)
projects/suj/7/usr.sbin/praliases/ (props changed)
projects/suj/7/usr.sbin/praudit/ (props changed)
projects/suj/7/usr.sbin/procctl/ (props changed)
projects/suj/7/usr.sbin/pstat/ (props changed)
projects/suj/7/usr.sbin/pw/ (props changed)
projects/suj/7/usr.sbin/pwd_mkdb/ (props changed)
projects/suj/7/usr.sbin/quot/ (props changed)
projects/suj/7/usr.sbin/quotaon/ (props changed)
projects/suj/7/usr.sbin/rarpd/ (props changed)
projects/suj/7/usr.sbin/raycontrol/ (props changed)
projects/suj/7/usr.sbin/repquota/ (props changed)
projects/suj/7/usr.sbin/rip6query/ (props changed)
projects/suj/7/usr.sbin/rmt/ (props changed)
projects/suj/7/usr.sbin/rndc/ (props changed)
projects/suj/7/usr.sbin/rndc-confgen/ (props changed)
projects/suj/7/usr.sbin/route6d/ (props changed)
projects/suj/7/usr.sbin/rpc.lockd/ (props changed)
projects/suj/7/usr.sbin/rpc.statd/ (props changed)
projects/suj/7/usr.sbin/rpc.umntall/ (props changed)
projects/suj/7/usr.sbin/rpc.yppasswdd/ (props changed)
projects/suj/7/usr.sbin/rpc.ypupdated/ (props changed)
projects/suj/7/usr.sbin/rpc.ypxfrd/ (props changed)
projects/suj/7/usr.sbin/rpcbind/ (props changed)
projects/suj/7/usr.sbin/rrenumd/ (props changed)
projects/suj/7/usr.sbin/rtadvd/ (props changed)
projects/suj/7/usr.sbin/rtprio/ (props changed)
projects/suj/7/usr.sbin/rtsold/ (props changed)
projects/suj/7/usr.sbin/rwhod/ (props changed)
projects/suj/7/usr.sbin/sa/ (props changed)
projects/suj/7/usr.sbin/sade/ (props changed)
projects/suj/7/usr.sbin/sendmail/ (props changed)
projects/suj/7/usr.sbin/service/ (props changed)
projects/suj/7/usr.sbin/service/Makefile (props changed)
projects/suj/7/usr.sbin/service/service.8 (props changed)
projects/suj/7/usr.sbin/service/service.sh (props changed)
projects/suj/7/usr.sbin/setfib/ (props changed)
projects/suj/7/usr.sbin/setfmac/ (props changed)
projects/suj/7/usr.sbin/setpmac/ (props changed)
projects/suj/7/usr.sbin/sicontrol/ (props changed)
projects/suj/7/usr.sbin/sliplogin/ (props changed)
projects/suj/7/usr.sbin/slstat/ (props changed)
projects/suj/7/usr.sbin/smbmsg/ (props changed)
projects/suj/7/usr.sbin/snapinfo/ (props changed)
projects/suj/7/usr.sbin/spkrtest/ (props changed)
projects/suj/7/usr.sbin/spray/ (props changed)
projects/suj/7/usr.sbin/sysinstall/ (props changed)
projects/suj/7/usr.sbin/syslogd/ (props changed)
projects/suj/7/usr.sbin/tcpdchk/ (props changed)
projects/suj/7/usr.sbin/tcpdmatch/ (props changed)
projects/suj/7/usr.sbin/tcpdrop/ (props changed)
projects/suj/7/usr.sbin/tcpdump/ (props changed)
projects/suj/7/usr.sbin/timed/ (props changed)
projects/suj/7/usr.sbin/traceroute/ (props changed)
projects/suj/7/usr.sbin/traceroute6/ (props changed)
projects/suj/7/usr.sbin/trpt/ (props changed)
projects/suj/7/usr.sbin/tzsetup/ (props changed)
projects/suj/7/usr.sbin/ugidfw/ (props changed)
projects/suj/7/usr.sbin/usbdevs/ (props changed)
projects/suj/7/usr.sbin/vidcontrol/ (props changed)
projects/suj/7/usr.sbin/vipw/ (props changed)
projects/suj/7/usr.sbin/watch/ (props changed)
projects/suj/7/usr.sbin/watchdogd/ (props changed)
projects/suj/7/usr.sbin/wlandebug/ (props changed)
projects/suj/7/usr.sbin/wlconfig/ (props changed)
projects/suj/7/usr.sbin/wpa/ (props changed)
projects/suj/7/usr.sbin/wpa/wpa_supplicant/ (props changed)
projects/suj/7/usr.sbin/yp_mkdb/ (props changed)
projects/suj/7/usr.sbin/ypbind/ (props changed)
projects/suj/7/usr.sbin/yppoll/ (props changed)
projects/suj/7/usr.sbin/yppush/ (props changed)
projects/suj/7/usr.sbin/ypserv/ (props changed)
projects/suj/7/usr.sbin/ypset/ (props changed)
projects/suj/7/usr.sbin/zic/ (props changed)
projects/suj/7/usr.sbin/zzz/ (props changed)
Modified: projects/suj/7/lib/libufs/Makefile
==============================================================================
--- projects/suj/7/lib/libufs/Makefile Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/lib/libufs/Makefile Wed Jan 20 10:21:04 2010 (r202690)
@@ -3,7 +3,7 @@
LIB= ufs
SHLIBDIR?= /lib
-SRCS= block.c cgroup.c inode.c sblock.c type.c
+SRCS= block.c cgroup.c inode.c sblock.c type.c ffs_subr.c ffs_tables.c
INCS= libufs.h
MAN= bread.3 cgread.3 libufs.3 sbread.3 ufs_disk_close.3
@@ -17,6 +17,9 @@ MLINKS+= ufs_disk_close.3 ufs_disk_write
WARNS?= 2
+.PATH: ${.CURDIR}/../../sys/ufs/ffs
+
+DEBUG_FLAGS = -g
CFLAGS+= -D_LIBUFS
.if defined(LIBUFS_DEBUG)
CFLAGS+= -D_LIBUFS_DEBUGGING
Modified: projects/suj/7/lib/libufs/cgroup.c
==============================================================================
--- projects/suj/7/lib/libufs/cgroup.c Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/lib/libufs/cgroup.c Wed Jan 20 10:21:04 2010 (r202690)
@@ -40,11 +40,82 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <libufs.h>
+ufs2_daddr_t
+cgballoc(struct uufsd *disk)
+{
+ u_int8_t *blksfree;
+ struct cg *cgp;
+ struct fs *fs;
+ long bno;
+
+ fs = &disk->d_fs;
+ cgp = &disk->d_cg;
+ blksfree = cg_blksfree(cgp);
+ for (bno = 0; bno < fs->fs_fpg / fs->fs_frag; bno++)
+ if (ffs_isblock(fs, blksfree, bno))
+ goto gotit;
+ return (0);
+gotit:
+ fs->fs_cs(fs, cgp->cg_cgx).cs_nbfree--;
+ ffs_clrblock(fs, blksfree, (long)bno);
+ ffs_clusteracct(fs, cgp, bno, -1);
+ cgp->cg_cs.cs_nbfree--;
+ fs->fs_cstotal.cs_nbfree--;
+ fs->fs_fmod = 1;
+ return (cgbase(fs, cgp->cg_cgx) + blkstofrags(fs, bno));
+}
+
+ino_t
+cgialloc(struct uufsd *disk)
+{
+ struct ufs2_dinode *dp2;
+ u_int8_t *inosused;
+ struct cg *cgp;
+ struct fs *fs;
+ ino_t ino;
+ int i;
+
+ fs = &disk->d_fs;
+ cgp = &disk->d_cg;
+ inosused = cg_inosused(cgp);
+ for (ino = 0; ino < fs->fs_ipg / NBBY; ino++)
+ if (isclr(inosused, ino))
+ goto gotit;
+ return (0);
+gotit:
+ if (fs->fs_magic == FS_UFS2_MAGIC &&
+ ino + INOPB(fs) > cgp->cg_initediblk &&
+ cgp->cg_initediblk < cgp->cg_niblk) {
+ char block[MAXBSIZE];
+ bzero(block, (int)fs->fs_bsize);
+ dp2 = (struct ufs2_dinode *)█
+ for (i = 0; i < INOPB(fs); i++) {
+ dp2->di_gen = arc4random() / 2 + 1;
+ dp2++;
+ }
+ if (bwrite(disk, ino_to_fsba(fs,
+ cgp->cg_cgx * fs->fs_ipg + cgp->cg_initediblk),
+ block, fs->fs_bsize))
+ return (0);
+ cgp->cg_initediblk += INOPB(fs);
+ }
+
+ setbit(inosused, ino);
+ cgp->cg_irotor = ino;
+ cgp->cg_cs.cs_nifree--;
+ fs->fs_cstotal.cs_nifree--;
+ fs->fs_cs(fs, cgp->cg_cgx).cs_nifree--;
+ fs->fs_fmod = 1;
+
+ return (ino + (cgp->cg_cgx * fs->fs_ipg));
+}
+
int
cgread(struct uufsd *disk)
{
@@ -55,14 +126,12 @@ int
cgread1(struct uufsd *disk, int c)
{
struct fs *fs;
- off_t ccg;
fs = &disk->d_fs;
if (c >= fs->fs_ncg) {
return (0);
}
- ccg = fsbtodb(fs, cgtod(fs, c)) * disk->d_bsize;
if (bread(disk, fsbtodb(fs, cgtod(fs, c)), disk->d_cgunion.d_buf,
fs->fs_bsize) == -1) {
ERROR(disk, "unable to read cylinder group");
@@ -73,6 +142,12 @@ cgread1(struct uufsd *disk, int c)
}
int
+cgwrite(struct uufsd *disk)
+{
+ return (cgwrite1(disk, disk->d_lcg));
+}
+
+int
cgwrite1(struct uufsd *disk, int c)
{
struct fs *fs;
Modified: projects/suj/7/lib/libufs/inode.c
==============================================================================
--- projects/suj/7/lib/libufs/inode.c Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/lib/libufs/inode.c Wed Jan 20 10:21:04 2010 (r202690)
@@ -93,3 +93,19 @@ gotit: switch (disk->d_ufs) {
ERROR(disk, "unknown UFS filesystem type");
return (-1);
}
+
+int
+putino(struct uufsd *disk)
+{
+ struct fs *fs;
+
+ fs = &disk->d_fs;
+ if (disk->d_inoblock == NULL) {
+ ERROR(disk, "No inode block allocated");
+ return (-1);
+ }
+ if (bwrite(disk, fsbtodb(fs, ino_to_fsba(&disk->d_fs, disk->d_inomin)),
+ disk->d_inoblock, disk->d_fs.fs_bsize) <= 0)
+ return (-1);
+ return (0);
+}
Modified: projects/suj/7/lib/libufs/libufs.h
==============================================================================
--- projects/suj/7/lib/libufs/libufs.h Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/lib/libufs/libufs.h Wed Jan 20 10:21:04 2010 (r202690)
@@ -71,6 +71,7 @@ struct uufsd {
int d_fd; /* raw device file descriptor */
long d_bsize; /* device bsize */
ufs2_daddr_t d_sblock; /* superblock location */
+ struct csum *d_sbcsum; /* Superblock summary info */
caddr_t d_inoblock; /* inode block */
ino_t d_inomin; /* low inode */
ino_t d_inomax; /* high inode */
@@ -108,14 +109,18 @@ ssize_t bwrite(struct uufsd *, ufs2_dadd
/*
* cgroup.c
*/
+ufs2_daddr_t cgballoc(struct uufsd *);
+ino_t cgialloc(struct uufsd *);
int cgread(struct uufsd *);
int cgread1(struct uufsd *, int);
+int cgwrite(struct uufsd *);
int cgwrite1(struct uufsd *, int);
/*
* inode.c
*/
int getino(struct uufsd *, void **, ino_t, int *);
+int putino(struct uufsd *);
/*
* sblock.c
@@ -131,6 +136,16 @@ int ufs_disk_fillout(struct uufsd *, con
int ufs_disk_fillout_blank(struct uufsd *, const char *);
int ufs_disk_write(struct uufsd *);
+/*
+ * ffs_subr.c
+ */
+void ffs_clrblock(struct fs *, u_char *, ufs1_daddr_t);
+void ffs_clusteracct(struct fs *, struct cg *, ufs1_daddr_t, int);
+void ffs_fragacct(struct fs *, int, int32_t [], int);
+int ffs_isblock(struct fs *, u_char *, ufs1_daddr_t);
+int ffs_isfreeblock(struct fs *, u_char *, ufs1_daddr_t);
+void ffs_setblock(struct fs *, u_char *, ufs1_daddr_t);
+
__END_DECLS
#endif /* __LIBUFS_H__ */
Modified: projects/suj/7/lib/libufs/sblock.c
==============================================================================
--- projects/suj/7/lib/libufs/sblock.c Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/lib/libufs/sblock.c Wed Jan 20 10:21:04 2010 (r202690)
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include <unistd.h>
#include <libufs.h>
@@ -49,8 +50,11 @@ static int superblocks[] = SBLOCKSEARCH;
int
sbread(struct uufsd *disk)
{
+ uint8_t block[MAXBSIZE];
struct fs *fs;
int sb, superblock;
+ int i, size, blks;
+ uint8_t *space;
ERROR(disk, NULL);
@@ -86,6 +90,34 @@ sbread(struct uufsd *disk)
}
disk->d_bsize = fs->fs_fsize / fsbtodb(fs, 1);
disk->d_sblock = superblock / disk->d_bsize;
+ /*
+ * Read in the superblock summary information.
+ */
+ size = fs->fs_cssize;
+ blks = howmany(size, fs->fs_fsize);
+ size += fs->fs_ncg * sizeof(int32_t);
+ space = malloc(size);
+ if (space == NULL) {
+ ERROR(disk, "failed to allocate space for summary information");
+ return (-1);
+ }
+ fs->fs_csp = (struct csum *)space;
+ for (i = 0; i < blks; i += fs->fs_frag) {
+ size = fs->fs_bsize;
+ if (i + fs->fs_frag > blks)
+ size = (blks - i) * fs->fs_fsize;
+ if (bread(disk, fsbtodb(fs, fs->fs_csaddr + i), block, size)
+ == -1) {
+ ERROR(disk, "Failed to read sb summary information");
+ free(fs->fs_csp);
+ return (-1);
+ }
+ bcopy(block, space, size);
+ space += size;
+ }
+ fs->fs_maxcluster = (uint32_t *)space;
+ disk->d_sbcsum = fs->fs_csp;
+
return (0);
}
@@ -93,7 +125,8 @@ int
sbwrite(struct uufsd *disk, int all)
{
struct fs *fs;
- int i;
+ int i, blks, size;
+ uint8_t *space;
ERROR(disk, NULL);
@@ -107,6 +140,22 @@ sbwrite(struct uufsd *disk, int all)
ERROR(disk, "failed to write superblock");
return (-1);
}
+ /*
+ * Write superblock summary information.
+ */
+ blks = howmany(fs->fs_cssize, fs->fs_fsize);
+ space = (uint8_t *)disk->d_sbcsum;
+ for (i = 0; i < blks; i += fs->fs_frag) {
+ size = fs->fs_bsize;
+ if (i + fs->fs_frag > blks)
+ size = (blks - i) * fs->fs_fsize;
+ if (bwrite(disk, fsbtodb(fs, fs->fs_csaddr + i), space, size)
+ == -1) {
+ ERROR(disk, "Failed to write sb summary information");
+ return (-1);
+ }
+ space += size;
+ }
if (all) {
for (i = 0; i < fs->fs_ncg; i++)
if (bwrite(disk, fsbtodb(fs, cgsblock(fs, i)),
Modified: projects/suj/7/lib/libufs/type.c
==============================================================================
--- projects/suj/7/lib/libufs/type.c Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/lib/libufs/type.c Wed Jan 20 10:21:04 2010 (r202690)
@@ -66,6 +66,10 @@ ufs_disk_close(struct uufsd *disk)
free((char *)(uintptr_t)disk->d_name);
disk->d_name = NULL;
}
+ if (disk->d_sbcsum != NULL) {
+ free(disk->d_sbcsum);
+ disk->d_sbcsum = NULL;
+ }
return (0);
}
@@ -153,6 +157,7 @@ again: if ((ret = stat(name, &st)) < 0)
disk->d_mine = 0;
disk->d_ufs = 0;
disk->d_error = NULL;
+ disk->d_sbcsum = NULL;
if (oname != name) {
name = strdup(name);
Modified: projects/suj/7/sbin/fsck_ffs/Makefile
==============================================================================
--- projects/suj/7/sbin/fsck_ffs/Makefile Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/sbin/fsck_ffs/Makefile Wed Jan 20 10:21:04 2010 (r202690)
@@ -7,8 +7,7 @@ LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsc
MAN= fsck_ffs.8
MLINKS= fsck_ffs.8 fsck_ufs.8 fsck_ffs.8 fsck_4.2bsd.8
SRCS= dir.c ea.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \
- pass4.c pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c gjournal.c \
- getmntopts.c
+ pass4.c pass5.c setup.c suj.c utilities.c gjournal.c getmntopts.c
DPADD= ${LIBUFS}
LDADD= -lufs
WARNS?= 2
Modified: projects/suj/7/sbin/fsck_ffs/fsck.h
==============================================================================
--- projects/suj/7/sbin/fsck_ffs/fsck.h Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/sbin/fsck_ffs/fsck.h Wed Jan 20 10:21:04 2010 (r202690)
@@ -347,10 +347,6 @@ void direrror(ino_t ino, const char *er
int dirscan(struct inodesc *);
int dofix(struct inodesc *, const char *msg);
int eascan(struct inodesc *, struct ufs2_dinode *dp);
-void ffs_clrblock(struct fs *, u_char *, ufs1_daddr_t);
-void ffs_fragacct(struct fs *, int, int32_t [], int);
-int ffs_isblock(struct fs *, u_char *, ufs1_daddr_t);
-void ffs_setblock(struct fs *, u_char *, ufs1_daddr_t);
void fileerror(ino_t cwd, ino_t ino, const char *errmesg);
int findino(struct inodesc *);
int findname(struct inodesc *);
@@ -392,3 +388,4 @@ void sblock_init(void);
void setinodebuf(ino_t);
int setup(char *dev);
void gjournal_check(const char *filesys);
+void suj_check(const char *filesys);
Modified: projects/suj/7/sbin/fsck_ffs/gjournal.c
==============================================================================
--- projects/suj/7/sbin/fsck_ffs/gjournal.c Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/sbin/fsck_ffs/gjournal.c Wed Jan 20 10:21:04 2010 (r202690)
@@ -96,27 +96,6 @@ struct ufs2_dinode ufs2_zino;
static void putcgs(void);
/*
- * Write current block of inodes.
- */
-static int
-putino(struct uufsd *disk, ino_t inode)
-{
- caddr_t inoblock;
- struct fs *fs;
- ssize_t ret;
-
- fs = &disk->d_fs;
- inoblock = disk->d_inoblock;
-
- assert(inoblock != NULL);
- assert(inode >= disk->d_inomin && inode <= disk->d_inomax);
- ret = bwrite(disk, fsbtodb(fs, ino_to_fsba(fs, inode)), inoblock,
- fs->fs_bsize);
-
- return (ret == -1 ? -1 : 0);
-}
-
-/*
* Return cylinder group from the cache or load it if it is not in the
* cache yet.
* Don't cache more than MAX_CACHED_CGS cylinder groups.
@@ -242,13 +221,11 @@ cancelcgs(void)
#endif
/*
- * Open the given provider, load statistics.
+ * Open the given provider, load superblock.
*/
static void
-getdisk(void)
+opendisk(void)
{
- int i;
-
if (disk != NULL)
return;
disk = malloc(sizeof(*disk));
@@ -259,24 +236,6 @@ getdisk(void)
disk->d_error);
}
fs = &disk->d_fs;
- fs->fs_csp = malloc((size_t)fs->fs_cssize);
- if (fs->fs_csp == NULL)
- err(1, "malloc(%zu)", (size_t)fs->fs_cssize);
- bzero(fs->fs_csp, (size_t)fs->fs_cssize);
- for (i = 0; i < fs->fs_cssize; i += fs->fs_bsize) {
- if (bread(disk, fsbtodb(fs, fs->fs_csaddr + numfrags(fs, i)),
- (void *)(((char *)fs->fs_csp) + i),
- (size_t)(fs->fs_cssize - i < fs->fs_bsize ? fs->fs_cssize - i : fs->fs_bsize)) == -1) {
- err(1, "bread: %s", disk->d_error);
- }
- }
- if (fs->fs_contigsumsize > 0) {
- fs->fs_maxcluster = malloc(fs->fs_ncg * sizeof(int32_t));
- if (fs->fs_maxcluster == NULL)
- err(1, "malloc(%zu)", fs->fs_ncg * sizeof(int32_t));
- for (i = 0; i < fs->fs_ncg; i++)
- fs->fs_maxcluster[i] = fs->fs_contigsumsize;
- }
}
/*
@@ -286,11 +245,6 @@ static void
closedisk(void)
{
- free(fs->fs_csp);
- if (fs->fs_contigsumsize > 0) {
- free(fs->fs_maxcluster);
- fs->fs_maxcluster = NULL;
- }
fs->fs_clean = 1;
if (sbwrite(disk, 0) == -1)
err(1, "sbwrite(%s)", devnam);
@@ -301,227 +255,6 @@ closedisk(void)
fs = NULL;
}
-/*
- * Write the statistics back, call closedisk().
- */
-static void
-putdisk(void)
-{
- int i;
-
- assert(disk != NULL && fs != NULL);
- for (i = 0; i < fs->fs_cssize; i += fs->fs_bsize) {
- if (bwrite(disk, fsbtodb(fs, fs->fs_csaddr + numfrags(fs, i)),
- (void *)(((char *)fs->fs_csp) + i),
- (size_t)(fs->fs_cssize - i < fs->fs_bsize ? fs->fs_cssize - i : fs->fs_bsize)) == -1) {
- err(1, "bwrite: %s", disk->d_error);
- }
- }
- closedisk();
-}
-
-#if 0
-/*
- * Free memory, close the disk, but don't write anything back.
- */
-static void
-canceldisk(void)
-{
- int i;
-
- assert(disk != NULL && fs != NULL);
- free(fs->fs_csp);
- if (fs->fs_contigsumsize > 0)
- free(fs->fs_maxcluster);
- if (ufs_disk_close(disk) == -1)
- err(1, "ufs_disk_close(%s)", devnam);
- free(disk);
- disk = NULL;
- fs = NULL;
-}
-#endif
-
-static int
-isblock(unsigned char *cp, ufs1_daddr_t h)
-{
- unsigned char mask;
-
- switch ((int)fs->fs_frag) {
- case 8:
- return (cp[h] == 0xff);
- case 4:
- mask = 0x0f << ((h & 0x1) << 2);
- return ((cp[h >> 1] & mask) == mask);
- case 2:
- mask = 0x03 << ((h & 0x3) << 1);
- return ((cp[h >> 2] & mask) == mask);
- case 1:
- mask = 0x01 << (h & 0x7);
- return ((cp[h >> 3] & mask) == mask);
- default:
- assert(!"isblock: invalid number of fragments");
- }
- return (0);
-}
-
-/*
- * put a block into the map
- */
-static void
-setblock(unsigned char *cp, ufs1_daddr_t h)
-{
-
- switch ((int)fs->fs_frag) {
- case 8:
- cp[h] = 0xff;
- return;
- case 4:
- cp[h >> 1] |= (0x0f << ((h & 0x1) << 2));
- return;
- case 2:
- cp[h >> 2] |= (0x03 << ((h & 0x3) << 1));
- return;
- case 1:
- cp[h >> 3] |= (0x01 << (h & 0x7));
- return;
- default:
- assert(!"setblock: invalid number of fragments");
- }
-}
-
-/*
- * check if a block is free
- */
-static int
-isfreeblock(u_char *cp, ufs1_daddr_t h)
-{
-
- switch ((int)fs->fs_frag) {
- case 8:
- return (cp[h] == 0);
- case 4:
- return ((cp[h >> 1] & (0x0f << ((h & 0x1) << 2))) == 0);
- case 2:
- return ((cp[h >> 2] & (0x03 << ((h & 0x3) << 1))) == 0);
- case 1:
- return ((cp[h >> 3] & (0x01 << (h & 0x7))) == 0);
- default:
- assert(!"isfreeblock: invalid number of fragments");
- }
- return (0);
-}
-
-/*
- * Update the frsum fields to reflect addition or deletion
- * of some frags.
- */
-void
-fragacct(int fragmap, int32_t fraglist[], int cnt)
-{
- int inblk;
- int field, subfield;
- int siz, pos;
-
- inblk = (int)(fragtbl[fs->fs_frag][fragmap]) << 1;
- fragmap <<= 1;
- for (siz = 1; siz < fs->fs_frag; siz++) {
- if ((inblk & (1 << (siz + (fs->fs_frag % NBBY)))) == 0)
- continue;
- field = around[siz];
- subfield = inside[siz];
- for (pos = siz; pos <= fs->fs_frag; pos++) {
- if ((fragmap & field) == subfield) {
- fraglist[siz] += cnt;
- pos += siz;
- field <<= siz;
- subfield <<= siz;
- }
- field <<= 1;
- subfield <<= 1;
- }
- }
-}
-
-static void
-clusteracct(struct cg *cgp, ufs1_daddr_t blkno)
-{
- int32_t *sump;
- int32_t *lp;
- u_char *freemapp, *mapp;
- int i, start, end, forw, back, map, bit;
-
- if (fs->fs_contigsumsize <= 0)
- return;
- freemapp = cg_clustersfree(cgp);
- sump = cg_clustersum(cgp);
- /*
- * Clear the actual block.
- */
- setbit(freemapp, blkno);
- /*
- * Find the size of the cluster going forward.
- */
- start = blkno + 1;
- end = start + fs->fs_contigsumsize;
- if (end >= cgp->cg_nclusterblks)
- end = cgp->cg_nclusterblks;
- mapp = &freemapp[start / NBBY];
- map = *mapp++;
- bit = 1 << (start % NBBY);
- for (i = start; i < end; i++) {
- if ((map & bit) == 0)
- break;
- if ((i & (NBBY - 1)) != (NBBY - 1)) {
- bit <<= 1;
- } else {
- map = *mapp++;
- bit = 1;
- }
- }
- forw = i - start;
- /*
- * Find the size of the cluster going backward.
- */
- start = blkno - 1;
- end = start - fs->fs_contigsumsize;
- if (end < 0)
- end = -1;
- mapp = &freemapp[start / NBBY];
- map = *mapp--;
- bit = 1 << (start % NBBY);
- for (i = start; i > end; i--) {
- if ((map & bit) == 0)
- break;
- if ((i & (NBBY - 1)) != 0) {
- bit >>= 1;
- } else {
- map = *mapp--;
- bit = 1 << (NBBY - 1);
- }
- }
- back = start - i;
- /*
- * Account for old cluster and the possibly new forward and
- * back clusters.
- */
- i = back + forw + 1;
- if (i > fs->fs_contigsumsize)
- i = fs->fs_contigsumsize;
- sump[i]++;
- if (back > 0)
- sump[back]--;
- if (forw > 0)
- sump[forw]--;
- /*
- * Update cluster summary information.
- */
- lp = &sump[fs->fs_contigsumsize];
- for (i = fs->fs_contigsumsize; i > 0; i--)
- if (*lp-- > 0)
- break;
- fs->fs_maxcluster[cgp->cg_cgx] = i;
-}
-
static void
blkfree(ufs2_daddr_t bno, long size)
{
@@ -539,10 +272,10 @@ blkfree(ufs2_daddr_t bno, long size)
blksfree = cg_blksfree(cgp);
if (size == fs->fs_bsize) {
fragno = fragstoblks(fs, cgbno);
- if (!isfreeblock(blksfree, fragno))
+ if (!ffs_isfreeblock(fs, blksfree, fragno))
assert(!"blkfree: freeing free block");
- setblock(blksfree, fragno);
- clusteracct(cgp, fragno);
+ ffs_setblock(fs, blksfree, fragno);
+ ffs_clusteracct(fs, cgp, fragno, 1);
cgp->cg_cs.cs_nbfree++;
fs->fs_cstotal.cs_nbfree++;
fs->fs_cs(fs, cg).cs_nbfree++;
@@ -552,7 +285,7 @@ blkfree(ufs2_daddr_t bno, long size)
* decrement the counts associated with the old frags
*/
blk = blkmap(fs, blksfree, bbase);
- fragacct(blk, cgp->cg_frsum, -1);
+ ffs_fragacct(fs, blk, cgp->cg_frsum, -1);
/*
* deallocate the fragment
*/
@@ -569,16 +302,16 @@ blkfree(ufs2_daddr_t bno, long size)
* add back in counts associated with the new frags
*/
blk = blkmap(fs, blksfree, bbase);
- fragacct(blk, cgp->cg_frsum, 1);
+ ffs_fragacct(fs, blk, cgp->cg_frsum, 1);
/*
* if a complete block has been reassembled, account for it
*/
fragno = fragstoblks(fs, bbase);
- if (isblock(blksfree, fragno)) {
+ if (ffs_isblock(fs, blksfree, fragno)) {
cgp->cg_cs.cs_nffree -= fs->fs_frag;
fs->fs_cstotal.cs_nffree -= fs->fs_frag;
fs->fs_cs(fs, cg).cs_nffree -= fs->fs_frag;
- clusteracct(cgp, fragno);
+ ffs_clusteracct(fs, cgp, fragno, 1);
cgp->cg_cs.cs_nbfree++;
fs->fs_cstotal.cs_nbfree++;
fs->fs_cs(fs, cg).cs_nbfree++;
@@ -599,7 +332,7 @@ freeindir(ufs2_daddr_t blk, int level)
if (bread(disk, fsbtodb(fs, blk), (void *)&sblks, (size_t)fs->fs_bsize) == -1)
err(1, "bread: %s", disk->d_error);
blks = (ufs2_daddr_t *)&sblks;
- for (i = 0; i < howmany(fs->fs_bsize, sizeof(ufs2_daddr_t)); i++) {
+ for (i = 0; i < NINDIR(fs); i++) {
if (blks[i] == 0)
break;
if (level == 0)
@@ -671,7 +404,7 @@ gjournal_check(const char *filesys)
int cg, mode;
devnam = filesys;
- getdisk();
+ opendisk();
/* Are there any unreferenced inodes in this file system? */
if (fs->fs_unrefs == 0) {
//printf("No unreferenced inodes.\n");
@@ -747,7 +480,7 @@ gjournal_check(const char *filesys)
/* Zero-fill the inode. */
*dino = ufs2_zino;
/* Write the inode back. */
- if (putino(disk, ino) == -1)
+ if (putino(disk) == -1)
err(1, "putino(cg=%d ino=%d)", cg, ino);
if (cgp->cg_unrefs == 0) {
//printf("No more unreferenced inodes in cg=%d.\n", cg);
@@ -772,5 +505,5 @@ gjournal_check(const char *filesys)
/* Write back modified cylinder groups. */
putcgs();
/* Write back updated statistics and super-block. */
- putdisk();
+ closedisk();
}
Modified: projects/suj/7/sbin/fsck_ffs/main.c
==============================================================================
--- projects/suj/7/sbin/fsck_ffs/main.c Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/sbin/fsck_ffs/main.c Wed Jan 20 10:21:04 2010 (r202690)
@@ -257,7 +257,7 @@ checkfilesys(char *filesys)
}
if (ckclean && skipclean) {
/*
- * If file system is gjournaled, check it here.
+ * If file system is gjournaled or su+j, check it here.
*/
if ((fsreadfd = open(filesys, O_RDONLY)) < 0 || readsb(0) == 0)
exit(3); /* Cannot read superblock */
@@ -279,6 +279,18 @@ checkfilesys(char *filesys)
"CANNOT RUN FAST FSCK\n");
}
}
+#if 0
+ if ((sblock.fs_flags & FS_SUJ) != 0) {
+ if (sblock.fs_clean == 1) {
+ pwarn("FILE SYSTEM CLEAN; SKIPPING CHECKS\n");
+ exit(0);
+ }
+ suj_check(filesys);
+ if (chkdoreload(mntp) == 0)
+ exit(0);
+ exit(4);
+ }
+#endif
}
/*
* If we are to do a background check:
@@ -300,7 +312,7 @@ checkfilesys(char *filesys)
pfatal("MOUNTED READ-ONLY, CANNOT RUN IN BACKGROUND\n");
} else if ((fsreadfd = open(filesys, O_RDONLY)) >= 0) {
if (readsb(0) != 0) {
- if (sblock.fs_flags & FS_NEEDSFSCK) {
+ if (sblock.fs_flags & (FS_NEEDSFSCK | FS_SUJ)) {
bkgrdflag = 0;
pfatal("UNEXPECTED INCONSISTENCY, %s\n",
"CANNOT RUN IN BACKGROUND\n");
@@ -484,6 +496,7 @@ checkfilesys(char *filesys)
inocleanup();
if (fsmodified) {
sblock.fs_time = time(NULL);
+ sblock.fs_mtime = time(NULL);
sbdirty();
}
if (cvtlevel && sblk.b_dirty) {
Modified: projects/suj/7/sbin/fsck_ffs/pass4.c
==============================================================================
--- projects/suj/7/sbin/fsck_ffs/pass4.c Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/sbin/fsck_ffs/pass4.c Wed Jan 20 10:21:04 2010 (r202690)
@@ -72,6 +72,9 @@ pass4(void)
for (i = 0; i < inostathead[cg].il_numalloced; i++, inumber++) {
if (inumber < ROOTINO)
continue;
+ if (sblock.fs_flags & FS_SUJ &&
+ inumber == sblock.fs_sujournal)
+ continue;
idesc.id_number = inumber;
switch (inoinfo(inumber)->ino_state) {
Modified: projects/suj/7/sbin/fsck_ffs/pass5.c
==============================================================================
--- projects/suj/7/sbin/fsck_ffs/pass5.c Wed Jan 20 10:15:55 2010 (r202689)
+++ projects/suj/7/sbin/fsck_ffs/pass5.c Wed Jan 20 10:21:04 2010 (r202690)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
#include <inttypes.h>
#include <limits.h>
#include <string.h>
+#include <libufs.h>
#include "fsck.h"
Copied: projects/suj/7/sbin/fsck_ffs/suj.c (from r202688, projects/suj/8/sbin/fsck_ffs/suj.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/suj/7/sbin/fsck_ffs/suj.c Wed Jan 20 10:21:04 2010 (r202690, copy of r202688, projects/suj/8/sbin/fsck_ffs/suj.c)
@@ -0,0 +1,2065 @@
+/*-
+ * Copyright (c) 2009 Jeffrey W. Roberson <jeff at FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/disklabel.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <ufs/ufs/ufsmount.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <libufs.h>
+#include <strings.h>
+#include <err.h>
+#include <assert.h>
+
+#include "fsck.h"
+
+static void ino_decr(ino_t);
+
+#define SUJ_HASHSIZE 128
+#define SUJ_HASHMASK (SUJ_HASHSIZE - 1)
+#define SUJ_HASH(x) ((x * 2654435761) & SUJ_HASHMASK)
+
+struct suj_seg {
+ TAILQ_ENTRY(suj_seg) ss_next;
+ struct jsegrec ss_rec;
+ uint8_t *ss_blk;
+};
+
+struct suj_rec {
+ TAILQ_ENTRY(suj_rec) sr_next;
+ union jrec *sr_rec;
+};
+TAILQ_HEAD(srechd, suj_rec);
+
+struct suj_ino {
+ LIST_ENTRY(suj_ino) si_next;
+ struct srechd si_recs;
+ struct srechd si_movs;
+ ino_t si_ino;
+ int si_nlinkadj;
+ int si_skipparent;
+ int si_linkadj;
+ int si_hasrecs;
+ int si_blkadj;
+};
+LIST_HEAD(inohd, suj_ino);
+
+struct suj_blk {
+ LIST_ENTRY(suj_blk) sb_next;
+ struct srechd sb_recs;
+ ufs2_daddr_t sb_blk;
+};
+LIST_HEAD(blkhd, suj_blk);
+
+struct data_blk {
+ LIST_ENTRY(data_blk) db_next;
+ uint8_t *db_buf;
+ ufs2_daddr_t db_blk;
+ int db_size;
+};
+
+struct ino_blk {
+ LIST_ENTRY(ino_blk) ib_next;
+ uint8_t *ib_buf;
+ int ib_dirty;
+ ufs2_daddr_t ib_blk;
+};
+LIST_HEAD(iblkhd, ino_blk);
+
+struct suj_cg {
+ LIST_ENTRY(suj_cg) sc_next;
+ struct blkhd sc_blkhash[SUJ_HASHSIZE];
+ struct inohd sc_inohash[SUJ_HASHSIZE];
+ struct iblkhd sc_iblkhash[SUJ_HASHSIZE];
+ struct ino_blk *sc_lastiblk;
+ uint8_t *sc_cgbuf;
+ struct cg *sc_cgp;
+ int sc_dirty;
+ int sc_cgx;
+};
+
+LIST_HEAD(cghd, suj_cg) cghash[SUJ_HASHSIZE];
+LIST_HEAD(dblkhd, data_blk) dbhash[SUJ_HASHSIZE];
+
+TAILQ_HEAD(seghd, suj_seg) allsegs;
+uint64_t oldseq;
+static struct uufsd *disk = NULL;
+static struct fs *fs = NULL;
+
+/*
+ * Summary statistics.
+ */
+uint64_t freefrags;
+uint64_t freeblocks;
+uint64_t freeinos;
+uint64_t freedir;
+uint64_t jbytes;
+uint64_t jrecs;
+
+typedef void (*ino_visitor)(ino_t, ufs_lbn_t, ufs2_daddr_t, int);
+
+static void *
+errmalloc(size_t n)
+{
+ void *a;
+
+ a = malloc(n);
+ if (a == NULL)
+ errx(1, "malloc(%zu)", n);
+ return (a);
+}
+
+/*
+ * Open the given provider, load superblock.
+ */
+static void
+opendisk(const char *devnam)
+{
+ if (disk != NULL)
+ return;
+ disk = malloc(sizeof(*disk));
+ if (disk == NULL)
+ errx(1, "malloc(%zu)", sizeof(*disk));
+ if (ufs_disk_fillout(disk, devnam) == -1) {
+ err(1, "ufs_disk_fillout(%s) failed: %s", devnam,
+ disk->d_error);
+ }
+ fs = &disk->d_fs;
+ /*
+ * Setup a few things so reply() can work.
+ */
+ bcopy(fs, &sblock, sizeof(sblock));
+ fsreadfd = disk->d_fd;
+ fswritefd = disk->d_fd;
+}
+
+/*
+ * Mark file system as clean, write the super-block back, close the disk.
+ */
+static void
+closedisk(const char *devnam)
+{
+ struct csum *cgsum;
+ int i;
+
+ /*
+ * Recompute the fs summary info from correct cs summaries.
+ */
+ bzero(&fs->fs_cstotal, sizeof(struct csum_total));
+ for (i = 0; i < fs->fs_ncg; i++) {
+ cgsum = &fs->fs_cs(fs, i);
+ fs->fs_cstotal.cs_nffree += cgsum->cs_nffree;
+ fs->fs_cstotal.cs_nbfree += cgsum->cs_nbfree;
+ fs->fs_cstotal.cs_nifree += cgsum->cs_nifree;
+ fs->fs_cstotal.cs_ndir += cgsum->cs_ndir;
+ }
+ /* XXX Don't set clean for now, we don't trust the journal. */
+ /* fs->fs_clean = 1; */
+ fs->fs_time = time(NULL);
+ fs->fs_mtime = time(NULL);
+ if (sbwrite(disk, 0) == -1)
+ err(1, "sbwrite(%s)", devnam);
+ if (ufs_disk_close(disk) == -1)
+ err(1, "ufs_disk_close(%s)", devnam);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list