[src/chs-ubc2]: src/sys/ufs Take two at making a non-converted LFS work in a ...

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

details:   https://anonhg.NetBSD.org/src/rev/2f24f0322ebb
branches:  chs-ubc2
changeset: 471355:2f24f0322ebb
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jul 02 22:43:23 1999 +0000

description:
Take two at making a non-converted LFS work in a UBC kernel.

diffstat:

 sys/ufs/lfs/lfs_vnops.c     |   4 +---
 sys/ufs/ufs/ufs_readwrite.c |  10 ++++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (62 lines):

diff -r 5f6609e5f45c -r 2f24f0322ebb sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Fri Jul 02 18:54:10 1999 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Fri Jul 02 22:43:23 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.25.2.1.2.2 1999/06/21 15:50:49 thorpej Exp $   */
+/*     $NetBSD: lfs_vnops.c,v 1.25.2.1.2.3 1999/07/02 22:43:23 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -98,8 +98,6 @@
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
 
-#include <ufs/ffs/ffs_extern.h>
-
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_extern.h>
 
diff -r 5f6609e5f45c -r 2f24f0322ebb sys/ufs/ufs/ufs_readwrite.c
--- a/sys/ufs/ufs/ufs_readwrite.c       Fri Jul 02 18:54:10 1999 +0000
+++ b/sys/ufs/ufs/ufs_readwrite.c       Fri Jul 02 22:43:23 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_readwrite.c,v 1.22.4.2 1999/06/22 02:29:49 thorpej Exp $   */
+/*     $NetBSD: ufs_readwrite.c,v 1.22.4.3 1999/07/02 22:43:27 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1993
@@ -262,14 +262,13 @@
        osize = ip->i_ffs_size;
        flags = ioflag & IO_SYNC ? B_SYNC : 0;
 
+#ifndef LFS_READWRITE
        if (vp->v_type == VREG) {
-
                /*
                 * make sure the range of file offsets to be written
                 * is fully allocated.  updating of ip->i_ffs_size
                 * is handled by ffs_balloc_range().
                 */
-
                if ((error = ffs_balloc_range(ip, uio->uio_offset,
                                              uio->uio_resid, ap->a_cred, 0))) {
                        return error;
@@ -299,6 +298,7 @@
                }
                goto out;
        }
+#endif /* ! LFS_READWRITE */
 
        for (error = 0; uio->uio_resid > 0;) {
                lbn = lblkno(fs, uio->uio_offset);
@@ -367,7 +367,9 @@
         * we clear the setuid and setgid bits as a precaution against
         * tampering.
         */
-out:
+#ifndef LFS_READWRITE
+ out:
+#endif
        if (resid > uio->uio_resid && ap->a_cred && ap->a_cred->cr_uid != 0)
                ip->i_ffs_mode &= ~(ISUID | ISGID);
        if (error) {