Re: cvs commit: src/sys/vfs/hammer hammer.h hammer_flusher.c hammer_inode.c hammer_io.c hammer_object.c hammer_prune.c hammer_reblock.c hammer_recover.c hammer_transaction.c hammer_vfsops.c hammer_vnops.c

[Michael Neumann]

Sepherosa Ziehau wrote:

On Mon, Jun 9, 2008 at 12:19 PM, Matthew Dillon
<[EMAIL PROTECTED]> wrote:

dillon      2008/06/08 21:19:10 PDT

DragonFly src repository

 Modified files:
   sys/vfs/hammer       hammer.h hammer_flusher.c hammer_inode.c
                        hammer_io.c hammer_object.c
                        hammer_prune.c hammer_reblock.c
                        hammer_recover.c hammer_transaction.c
                        hammer_vfsops.c hammer_vnops.c
 Log:
 HAMMER 53C/Many: Stabilization

 Revision  Changes    Path
 1.76      +15 -2     src/sys/vfs/hammer/hammer.h
 1.20      +104 -107  src/sys/vfs/hammer/hammer_flusher.c
 1.67      +65 -7     src/sys/vfs/hammer/hammer_inode.c
 1.36      +62 -11    src/sys/vfs/hammer/hammer_io.c
 1.63      +19 -9     src/sys/vfs/hammer/hammer_object.c
 1.5       +12 -15    src/sys/vfs/hammer/hammer_prune.c
 1.17      +14 -13    src/sys/vfs/hammer/hammer_reblock.c
 1.22      +43 -24    src/sys/vfs/hammer/hammer_recover.c
 1.16      +2 -0      src/sys/vfs/hammer/hammer_transaction.c
 1.41      +17 -6     src/sys/vfs/hammer/hammer_vfsops.c
 1.61      +18 -1     src/sys/vfs/hammer/hammer_vnops.c

http://www.dragonflybsd.org/cvsweb/src/sys/vfs/hammer/hammer_vfsops.c.diff?r1=1.40&r2=1.41&f=u

The change in the above file breaks build:

--- src/sys/vfs/hammer/hammer_vfsops.c  2008/06/08 18:16:26     1.40
+++ src/sys/vfs/hammer/hammer_vfsops.c  2008/06/09 04:19:10     1.41
...
...
@@ -102,6 +103,8 @@ SYSCTL_INT(_vfs_hammer, OID_AUTO, limit_

 SYSCTL_INT(_vfs_hammer, OID_AUTO, count_inodes, CTLFLAG_RD,
           &hammer_count_inodes, 0, "");
+SYSCTL_INT(_vfs_hammer, OID_AUTO, count_reclaiming, CTLFLAG_RD,
+          &hammer_count_reclaiming, 0, "");
 SYSCTL_INT(_vfs_hammer, OID_AUTO, count_records, CTLFLAG_RD,
           &hammer_count_records, 0, "");
 SYSCTL_INT(_vfs_hammer, OID_AUTO, count_record_datas, CTLFLAG_RD,
@@ -171,6 +174,11 @@ hammer_vfs_init(struct vfsconf *conf)
                hammer_limit_irecs = nbuf;
        if (hammer_limit_recs == 0)             /* XXX TODO */
                hammer_limit_recs = hammer_limit_irecs * 4;
+       if (hammer_limit_dirtybufs == 0) {
+               hammer_limit_dirtybufs = hidirtybuffers / 2;
+               if (hammer_limit_dirtybufs < 100)
+                       hammer_limit_dirtybufs = 100;
+       }
        return(0);
 }

/usr/src/sys/vfs/hammer/hammer_vfsops.c: In function 'hammer_vfs_init':^M
/usr/src/sys/vfs/hammer/hammer_vfsops.c:178: error: 'hidirtybuffers'
undeclared (first use in this function)^M
/usr/src/sys/vfs/hammer/hammer_vfsops.c:178: error: (Each undeclared
identifier is reported only once^M
/usr/src/sys/vfs/hammer/hammer_vfsops.c:178: error: for each function
it appears in.)^M

I think an "extern int hidirtybuffers" will do. It's declared in vfs_bio.c.

Regards,

  Michael