[src/trunk]: src/sys Make LFS LKM versions of ufs_makeinode and ufs_mkdir fai...

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

details:   https://anonhg.NetBSD.org/src/rev/b961d88f82d8
branches:  trunk
changeset: 544236:b961d88f82d8
user:      perseant <perseant%NetBSD.org@localhost>
date:      Sat Mar 15 07:20:22 2003 +0000

description:
Make LFS LKM versions of ufs_makeinode and ufs_mkdir fail correctly.

Note dependency of lfs_vnops.o on ufs_readwrite.c.

diffstat:

 sys/lkm/vfs/ufs/lfs/Makefile      |  10 ++++++++--
 sys/lkm/vfs/ufs/lfs/lkminit_vfs.c |   9 ++++++---
 sys/ufs/ufs/ufs_vnops.c           |   6 ++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r 33c8a489633e -r b961d88f82d8 sys/lkm/vfs/ufs/lfs/Makefile
--- a/sys/lkm/vfs/ufs/lfs/Makefile      Sat Mar 15 07:19:20 2003 +0000
+++ b/sys/lkm/vfs/ufs/lfs/Makefile      Sat Mar 15 07:20:22 2003 +0000
@@ -1,14 +1,20 @@
-#      $NetBSD: Makefile,v 1.8 2001/12/12 12:06:50 lukem Exp $
+#      $NetBSD: Makefile,v 1.9 2003/03/15 07:20:22 perseant Exp $
 
 .include "../Makefile.inc"
 
-.PATH: $S/ufs/lfs
+.PATH: $S/ufs/lfs $S/ufs/ufs
+
+lfs_vnops.o: ufs_readwrite.c
 
+COPTS+=        -DLFS -Dufs_mkdir=lfs_ufs_mkdir -Dufs_makeinode=lfs_ufs_makeinode \
+       -Dufs_strategy=lfs_ufs_strategy -Dufs_whiteout=lfs_ufs_whiteout \
+       -Dufs_link=lfs_ufs_link -Dufs_rename=lfs_ufs_rename
 KMOD=  lfs
 
 SRCS=  lkminit_vfs.c
 SRCS+= lfs_vfsops.c lfs_vnops.c lfs_subr.c
 SRCS+= lfs_alloc.c lfs_balloc.c lfs_bio.c lfs_cksum.c lfs_debug.c
 SRCS+= lfs_inode.c lfs_segment.c lfs_syscalls.c 
+SRCS+= ufs_vnops.c
 
 .include <bsd.kmod.mk>
diff -r 33c8a489633e -r b961d88f82d8 sys/lkm/vfs/ufs/lfs/lkminit_vfs.c
--- a/sys/lkm/vfs/ufs/lfs/lkminit_vfs.c Sat Mar 15 07:19:20 2003 +0000
+++ b/sys/lkm/vfs/ufs/lfs/lkminit_vfs.c Sat Mar 15 07:20:22 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.5 2003/01/19 16:30:13 thorpej Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.6 2003/03/15 07:20:23 perseant Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lkminit_vfs.c,v 1.5 2003/01/19 16:30:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lkminit_vfs.c,v 1.6 2003/03/15 07:20:23 perseant Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -46,7 +46,10 @@
 #include <sys/file.h>
 #include <sys/errno.h>
 
-#define LFS
+#ifndef LFS
+# define LFS
+#endif
+
 #include <sys/syscall.h>
 #include <sys/sa.h>
 #include <sys/syscallargs.h>
diff -r 33c8a489633e -r b961d88f82d8 sys/ufs/ufs/ufs_vnops.c
--- a/sys/ufs/ufs/ufs_vnops.c   Sat Mar 15 07:19:20 2003 +0000
+++ b/sys/ufs/ufs/ufs_vnops.c   Sat Mar 15 07:20:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_vnops.c,v 1.90 2003/02/17 23:48:23 perseant Exp $  */
+/*     $NetBSD: ufs_vnops.c,v 1.91 2003/03/15 07:20:22 perseant Exp $  */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993, 1995
@@ -41,10 +41,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.90 2003/02/17 23:48:23 perseant Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.91 2003/03/15 07:20:22 perseant Exp $");
 
+#ifndef _LKM
 #include "opt_quota.h"
 #include "fs_lfs.h"
+#endif /* _LKM */
 
 #include <sys/param.h>
 #include <sys/systm.h>