Re: CVS commit: othersrc/zfs/external/cddl/osnet/dist

[Simon Burge <simonb%NetBSD.org@localhost>]

Andrew Doran wrote:

> Module Name:  othersrc
> Committed By: ad
> Date:         Thu Mar 26 21:50:47 UTC 2009
> 
> Modified Files:
> 
>       othersrc/zfs/external/cddl/osnet/dist/cmd/zpool: zpool_vdev.c
>       othersrc/zfs/external/cddl/osnet/dist/cmd/ztest: ztest.c
>       othersrc/zfs/external/cddl/osnet/dist/uts/common/fs/zfs: arc.c dmu.c
>           dsl_deleg.c spa.c spa_history.c vdev_disk.c zfs_ctldir.c zfs_dir.c
>           zfs_ioctl.c zfs_vfsops.c zfs_znode.c zvol.c
>       othersrc/zfs/external/cddl/osnet/dist/uts/common/fs/zfs/sys:
>           vdev_disk.h zfs_znode.h zvol.h
> 
> Log Message:
> 
> Apply NetBSD changes.

Just out of interest...


Index: othersrc/zfs/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
diff -u othersrc/zfs/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.1.1.1 
othersrc/zfs/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.2
--- othersrc/zfs/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.1.1.1       
Fri Mar 27 08:43:43 2009
+++ othersrc/zfs/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c       Fri Mar 
27 08:50:47 2009
@@ -133,6 +133,42 @@
 #include <sys/callb.h>
 #include <sys/kstat.h>
   
+#ifdef __NetBSD__
+#include <uvm/uvm.h>
+#define        btop(x)         ((x) * PAGE_SIZE)
  [ ... ]

Isn't that working out "pages to bytes" and not "bytes to pages" ?

Unless btop() means something non-obvious in Solaris land...

Simon.