svn commit: r211698 - in user/imp/tbemd: contrib/top sys/kern

[Warner Losh]

Author: imp
Date: Mon Aug 23 06:40:21 2010
New Revision: 211698
URL: http://svn.freebsd.org/changeset/base/211698

Log:
  Merge head at 211697

Modified:
  user/imp/tbemd/sys/kern/Makefile
  user/imp/tbemd/sys/kern/vfs_default.c
Directory Properties:
  user/imp/tbemd/   (props changed)
  user/imp/tbemd/cddl/contrib/opensolaris/   (props changed)
  user/imp/tbemd/contrib/bind9/   (props changed)
  user/imp/tbemd/contrib/ee/   (props changed)
  user/imp/tbemd/contrib/expat/   (props changed)
  user/imp/tbemd/contrib/file/   (props changed)
  user/imp/tbemd/contrib/gdb/   (props changed)
  user/imp/tbemd/contrib/gdtoa/   (props changed)
  user/imp/tbemd/contrib/gnu-sort/   (props changed)
  user/imp/tbemd/contrib/groff/   (props changed)
  user/imp/tbemd/contrib/less/   (props changed)
  user/imp/tbemd/contrib/libpcap/   (props changed)
  user/imp/tbemd/contrib/llvm/   (props changed)
  user/imp/tbemd/contrib/llvm/tools/clang/   (props changed)
  user/imp/tbemd/contrib/ncurses/   (props changed)
  user/imp/tbemd/contrib/netcat/   (props changed)
  user/imp/tbemd/contrib/ntp/   (props changed)
  user/imp/tbemd/contrib/one-true-awk/   (props changed)
  user/imp/tbemd/contrib/openbsm/   (props changed)
  user/imp/tbemd/contrib/openpam/   (props changed)
  user/imp/tbemd/contrib/pf/   (props changed)
  user/imp/tbemd/contrib/sendmail/   (props changed)
  user/imp/tbemd/contrib/tcpdump/   (props changed)
  user/imp/tbemd/contrib/tcsh/   (props changed)
  user/imp/tbemd/contrib/top/   (props changed)
  user/imp/tbemd/contrib/top/install-sh   (props changed)
  user/imp/tbemd/contrib/tzcode/stdtime/   (props changed)
  user/imp/tbemd/contrib/tzcode/zic/   (props changed)
  user/imp/tbemd/contrib/tzdata/   (props changed)
  user/imp/tbemd/contrib/wpa/   (props changed)
  user/imp/tbemd/crypto/openssh/   (props changed)
  user/imp/tbemd/crypto/openssl/   (props changed)
  user/imp/tbemd/lib/libc/   (props changed)
  user/imp/tbemd/lib/libc/stdtime/   (props changed)
  user/imp/tbemd/lib/libutil/   (props changed)
  user/imp/tbemd/lib/libz/   (props changed)
  user/imp/tbemd/sbin/   (props changed)
  user/imp/tbemd/sbin/ipfw/   (props changed)
  user/imp/tbemd/share/zoneinfo/   (props changed)
  user/imp/tbemd/sys/   (props changed)
  user/imp/tbemd/sys/amd64/include/xen/   (props changed)
  user/imp/tbemd/sys/cddl/contrib/opensolaris/   (props changed)
  user/imp/tbemd/sys/contrib/dev/acpica/   (props changed)
  user/imp/tbemd/sys/contrib/pf/   (props changed)
  user/imp/tbemd/sys/contrib/x86emu/   (props changed)
  user/imp/tbemd/sys/dev/xen/xenpci/   (props changed)
  user/imp/tbemd/usr.bin/csup/   (props changed)
  user/imp/tbemd/usr.bin/procstat/   (props changed)
  user/imp/tbemd/usr.sbin/zic/   (props changed)

Modified: user/imp/tbemd/sys/kern/Makefile
==============================================================================
--- user/imp/tbemd/sys/kern/Makefile	Mon Aug 23 06:33:23 2010	(r211697)
+++ user/imp/tbemd/sys/kern/Makefile	Mon Aug 23 06:40:21 2010	(r211698)
@@ -28,7 +28,7 @@ init_sysent.c syscalls.c systrace_args.c
 # are placed in each source directory.  We need to have links to tags files
 # from the generic directories that are relative to the machine type, even
 # via remote mounts; therefore we use symlinks to $SYSTAGS, which points at
-# ${SYSDIR}/${MACHINE_CPUARCH}/tags.
+# ${SYSDIR}/${MACHINE}/tags.
 
 SYSTAGS=/var/db/sys_tags
 SYSDIR=/sys
@@ -51,7 +51,7 @@ tags::
 
 links::
 	rm -f ${SYSTAGS}
-	ln -s ${SYSDIR}/${MACHINE_CPUARCH}/tags ${SYSTAGS}
+	ln -s ${SYSDIR}/${MACHINE}/tags ${SYSTAGS}
 	-for i in ${DGEN}; do \
 	    (cd ../$$i && { rm -f tags; ln -s ${SYSTAGS} tags; }) done
 	-for i in ${ARCH}; do \

Modified: user/imp/tbemd/sys/kern/vfs_default.c
==============================================================================
--- user/imp/tbemd/sys/kern/vfs_default.c	Mon Aug 23 06:33:23 2010	(r211697)
+++ user/imp/tbemd/sys/kern/vfs_default.c	Mon Aug 23 06:40:21 2010	(r211698)
@@ -281,10 +281,9 @@ get_next_dirent(struct vnode *vp, struct
 		if (error)
 			return (error);
 
-		*off = uio.uio_offset;
-
 		*cpos = dirbuf;
-		*len = (dirbuflen - uio.uio_resid);
+		*len = uio.uio_offset - *off;
+		*off = uio.uio_offset;
 	}
 
 	dp = (struct dirent *)(*cpos);