[src/netbsd-1-6]: src/sys/ufs/ufs Pull up revision 1.28 (requested by persean...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/40b0ddac9934
branches:  netbsd-1-6
changeset: 528023:40b0ddac9934
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu Jun 20 03:52:33 2002 +0000

description:
Pull up revision 1.28 (requested by perseant in ticket #325):
For synchronous writes, keep separate i/o counters for each write, so
processes don't have to wait for one another to finish (e.g., nfsd seems
to be a little happier now, though I haven't measured the difference).
Synchronous checkpoints, however, must always wait for all i/o to finish.
Take the contents of the callback functions and have them run in thread
context instead (aiodoned thread).  lfs_iocount no longer has to be
protected in splbio(), and quite a bit less of the segment construction
loop needs to be in splbio() as well.
If lfs_markv is handed a block that is not the correct size according to
the inode, refuse to process it.  (Formerly it was extended to the "correct"
size.)  This is possibly more prone to deadlock, but less prone to corruption.
lfs_segclean now outright refuses to clean segments that appear to have live
bytes in them.  Again this may be more prone to deadlock but avoids
corruption.
Replace ufsspec_close and ufsfifo_close with LFS equivalents; this means
that no UFS functions need to know about LFS_ITIMES any more.  Remove
the reference from ufs/inode.h.
Tested on i386, test-compiled on alpha.

diffstat:

 sys/ufs/ufs/inode.h |  17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

diffs (51 lines):

diff -r ff2b62b9a671 -r 40b0ddac9934 sys/ufs/ufs/inode.h
--- a/sys/ufs/ufs/inode.h       Thu Jun 20 03:52:22 2002 +0000
+++ b/sys/ufs/ufs/inode.h       Thu Jun 20 03:52:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inode.h,v 1.27 2001/12/18 10:57:23 fvdl Exp $  */
+/*     $NetBSD: inode.h,v 1.27.10.1 2002/06/20 03:52:33 lukem Exp $    */
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -45,7 +45,6 @@
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ext2fs/ext2fs_dinode.h>
-#include <ufs/lfs/lfs_extern.h>
 #include <miscfs/genfs/genfs_node.h>
 
 /*
@@ -176,9 +175,6 @@
 #define IN_SPACECOUNTED        0x0400          /* Blocks to be freed in free count. */
 
 #if defined(_KERNEL)
-#if defined(_KERNEL_OPT)
-#include "fs_lfs.h" /* for ITIMES */
-#endif /* _KERNEL_OPT */
 /*
  * Structure used to pass around logical block paths generated by
  * ufs_getlbns and used by truncate and bmap code.
@@ -234,23 +230,12 @@
        }                                                               \
 }
 
-#ifdef LFS
-#define        ITIMES(ip, acc, mod, cre) {                     \
-       if (IS_EXT2_VNODE((ip)->i_vnode))               \
-               EXT2FS_ITIMES(ip, acc, mod, cre)        \
-       else if(IS_LFS_VNODE((ip)->i_vnode))            \
-               lfs_itimes(ip, acc, mod, cre);          \
-       else                                            \
-               FFS_ITIMES(ip, acc, mod, cre)           \
-}
-#else /* ! LFS */
 #define        ITIMES(ip, acc, mod, cre) {                     \
        if (IS_EXT2_VNODE((ip)->i_vnode))               \
                EXT2FS_ITIMES(ip, acc, mod, cre)        \
        else                                            \
                FFS_ITIMES(ip, acc, mod, cre)           \
 }
-#endif /* ! LFS */
 
 /* Determine if soft dependencies are being done */
 #define        DOINGSOFTDEP(vp)        ((vp)->v_mount->mnt_flag & MNT_SOFTDEP)