Module Name: src
Committed By: pooka
Date: Sat May 2 01:15:54 UTC 2009
Modified Files:
src/distrib/sets/lists/base: shl.elf shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/lib/libukfs: ukfs.c
src/sys/rump/fs: Makefile.rumpfs
src/sys/rump/fs/lib/libffs: Makefile
src/tests/fs/ffs: Makefile
src/usr.sbin/puffs/rump_ext2fs: Makefile
src/usr.sbin/puffs/rump_ffs: Makefile
src/usr.sbin/puffs/rump_lfs: Makefile
Removed Files:
src/sys/rump/fs/lib/libufs: Makefile fs_ffs.h shlib_version
Log Message:
Merge librumpfs_ufs into librumpfs_ffs. This reflects what happened
with the ffs kernel module and follows the trend of retiring ufs.
It also allows to get rid of a special case kludge in runtime module
loading, since ufs was not really a module. librumpfs_ufs is now
obsoleted and ffs consumers should be linked solely against
librumpfs_ffs.
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.468 -r1.469 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1249 -r1.1250 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.24 -r1.25 src/lib/libukfs/ukfs.c
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/fs/lib/libffs/Makefile
cvs rdiff -u -r1.7 -r0 src/sys/rump/fs/lib/libufs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libufs/fs_ffs.h \
src/sys/rump/fs/lib/libufs/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/ffs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/puffs/rump_ext2fs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_ffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_lfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.170 src/distrib/sets/lists/base/shl.elf:1.171
--- src/distrib/sets/lists/base/shl.elf:1.170 Fri May 1 22:59:52 2009
+++ src/distrib/sets/lists/base/shl.elf Sat May 2 01:15:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.170 2009/05/01 22:59:52 agc Exp $
+# $NetBSD: shl.elf,v 1.171 2009/05/02 01:15:54 pooka Exp $
#
# Note: Do not mark "old" major and major.minor shared libraries as
# "obsolete"; just remove the entry, as third-party applications
@@ -248,8 +248,8 @@
./usr/lib/librumpfs_tmpfs.so.0 base-rump-shlib
./usr/lib/librumpfs_udf.so base-rump-shlib
./usr/lib/librumpfs_udf.so.0 base-rump-shlib
-./usr/lib/librumpfs_ufs.so base-rump-shlib
-./usr/lib/librumpfs_ufs.so.0 base-rump-shlib
+./usr/lib/librumpfs_ufs.so base-obsolete obsolete
+./usr/lib/librumpfs_ufs.so.0 base-obsolete obsolete
./usr/lib/librumpnet.so base-rump-shlib
./usr/lib/librumpnet.so.0 base-rump-shlib
./usr/lib/librumpnet_local.so base-rump-shlib
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.468 src/distrib/sets/lists/base/shl.mi:1.469
--- src/distrib/sets/lists/base/shl.mi:1.468 Fri May 1 22:59:52 2009
+++ src/distrib/sets/lists/base/shl.mi Sat May 2 01:15:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.468 2009/05/01 22:59:52 agc Exp $
+# $NetBSD: shl.mi,v 1.469 2009/05/02 01:15:54 pooka Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -131,7 +131,7 @@
./usr/lib/librumpfs_sysvbfs.so.0.0 base-rump-shlib
./usr/lib/librumpfs_tmpfs.so.0.0 base-rump-shlib
./usr/lib/librumpfs_udf.so.0.0 base-rump-shlib
-./usr/lib/librumpfs_ufs.so.0.0 base-rump-shlib
+./usr/lib/librumpfs_ufs.so.0.0 base-obsolete obsolete
./usr/lib/librumpnet.so.0.0 base-rump-shlib
./usr/lib/librumpnet_local.so.0.0 base-rump-shlib
./usr/lib/librumpnet_net.so.0.0 base-rump-shlib
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1249 src/distrib/sets/lists/comp/mi:1.1250
--- src/distrib/sets/lists/comp/mi:1.1249 Fri May 1 22:59:52 2009
+++ src/distrib/sets/lists/comp/mi Sat May 2 01:15:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1249 2009/05/01 22:59:52 agc Exp $
+# $NetBSD: mi,v 1.1250 2009/05/02 01:15:54 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2549,9 +2549,9 @@
./usr/lib/librumpfs_udf.a comp-c-lib
./usr/lib/librumpfs_udf_g.a -unknown- debuglib
./usr/lib/librumpfs_udf_p.a comp-c-proflib profile
-./usr/lib/librumpfs_ufs.a comp-c-lib
-./usr/lib/librumpfs_ufs_g.a -unknown- debuglib
-./usr/lib/librumpfs_ufs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_ufs.a comp-obsolete obsolete
+./usr/lib/librumpfs_ufs_g.a comp-obsolete obsolete
+./usr/lib/librumpfs_ufs_p.a comp-obsolete obsolete
./usr/lib/librumpnet.a comp-c-lib
./usr/lib/librumpnet_g.a -unknown- debuglib
./usr/lib/librumpnet_local.a comp-c-lib
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.79 src/distrib/sets/lists/comp/shl.mi:1.80
--- src/distrib/sets/lists/comp/shl.mi:1.79 Fri May 1 22:59:52 2009
+++ src/distrib/sets/lists/comp/shl.mi Sat May 2 01:15:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.79 2009/05/01 22:59:52 agc Exp $
+# $NetBSD: shl.mi,v 1.80 2009/05/02 01:15:54 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -94,7 +94,7 @@
./usr/lib/librumpfs_sysvbfs_pic.a comp-c-piclib
./usr/lib/librumpfs_tmpfs_pic.a comp-c-piclib
./usr/lib/librumpfs_udf_pic.a comp-c-piclib
-./usr/lib/librumpfs_ufs_pic.a comp-c-piclib
+./usr/lib/librumpfs_ufs_pic.a comp-obsolete obsolete
./usr/lib/librumpnet_pic.a comp-c-piclib
./usr/lib/librumpnet_local_pic.a comp-c-piclib
./usr/lib/librumpnet_net_pic.a comp-c-piclib
Index: src/lib/libukfs/ukfs.c
diff -u src/lib/libukfs/ukfs.c:1.24 src/lib/libukfs/ukfs.c:1.25
--- src/lib/libukfs/ukfs.c:1.24 Sun Apr 26 22:23:01 2009
+++ src/lib/libukfs/ukfs.c Sat May 2 01:15:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ukfs.c,v 1.24 2009/04/26 22:23:01 pooka Exp $ */
+/* $NetBSD: ukfs.c,v 1.25 2009/05/02 01:15:52 pooka Exp $ */
/*
* Copyright (c) 2007, 2008 Antti Kantee. All Rights Reserved.
@@ -672,13 +672,11 @@
* can't protect against other threads calling dl*() outside of ukfs,
* so just live with it being flimsy
*/
-#define UFSLIB "librumpfs_ufs.so"
int
ukfs_modload(const char *fname)
{
void *handle, *thesym;
struct stat sb;
- const char *p;
int error;
if (stat(fname, &sb) == -1)
@@ -694,20 +692,6 @@
return -1;
}
- /*
- * XXX: the ufs module is not loaded in the same fashion as the
- * others. But we can't do dlclose() for it, since that would
- * lead to not being able to load ffs/ext2fs/lfs. Hence hardcode
- * and kludge around the issue for now. But this should really
- * be fixed by fixing sys/ufs/ufs to be a kernel module.
- */
- if ((p = strrchr(fname, '/')) != NULL)
- p++;
- else
- p = fname;
- if (strcmp(p, UFSLIB) == 0)
- return 1;
-
thesym = dlsym(handle, "__start_link_set_modules");
if (thesym) {
error = rump_module_load(thesym);
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.12 src/sys/rump/fs/Makefile.rumpfs:1.13
--- src/sys/rump/fs/Makefile.rumpfs:1.12 Thu Oct 16 09:29:43 2008
+++ src/sys/rump/fs/Makefile.rumpfs Sat May 2 01:15:53 2009
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile.rumpfs,v 1.12 2008/10/16 09:29:43 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.13 2009/05/02 01:15:53 pooka Exp $
#
RUMPFSLIST= cd9660 efs ext2fs ffs hfs lfs msdos nfs ntfs syspuffs sysvbfs
RUMPFSLIST+= tmpfs udf
-RUMPFSALL= ${RUMPFSLIST} ufs
-
-.for var in ${RUMPFSALL}
+.for var in ${RUMPFSLIST}
RUMPFSLIBS+=lib${var}
RUMPFSLDADD+=-lrumpfs_${var}
.endfor
Index: src/sys/rump/fs/lib/libffs/Makefile
diff -u src/sys/rump/fs/lib/libffs/Makefile:1.8 src/sys/rump/fs/lib/libffs/Makefile:1.9
--- src/sys/rump/fs/lib/libffs/Makefile:1.8 Mon Apr 6 20:46:44 2009
+++ src/sys/rump/fs/lib/libffs/Makefile Sat May 2 01:15:53 2009
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/04/06 20:46:44 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/02 01:15:53 pooka Exp $
#
-.PATH: ${.CURDIR}/../../../../ufs/ffs
+.PATH: ${.CURDIR}/../../../../ufs/ffs ${.CURDIR}/../../../../ufs/ufs
LIB= rumpfs_ffs
@@ -9,7 +9,11 @@
ffs_snapshot.c ffs_subr.c ffs_tables.c ffs_vfsops.c ffs_vnops.c \
ffs_wapbl.c
+SRCS+= ufs_bmap.c ufs_dirhash.c ufs_ihash.c ufs_inode.c ufs_lookup.c \
+ ufs_vfsops.c ufs_vnops.c ufs_wapbl.c
+
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS
+CPPFLAGS+= -DUFS_DIRHASH -DWAPBL -DAPPLE_UFS
CFLAGS+= -Wno-pointer-sign
.include <bsd.lib.mk>
Index: src/tests/fs/ffs/Makefile
diff -u src/tests/fs/ffs/Makefile:1.3 src/tests/fs/ffs/Makefile:1.4
--- src/tests/fs/ffs/Makefile:1.3 Sun Apr 26 15:15:38 2009
+++ src/tests/fs/ffs/Makefile Sat May 2 01:15:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/26 15:15:38 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/02 01:15:54 pooka Exp $
#
TESTSDIR= ${TESTSBASE}/fs/ffs
@@ -6,7 +6,6 @@
TESTS_C= t_renamerace
-LDADD.t_renamerace+= -lrumpfs_ffs -lrumpfs_ufs -lrumpvfs -lrump
-LDADD.t_renamerace+= -lrumpuser -lpthread
+LDADD+= -lrumpfs_ffs -lrumpvfs -lrump -lrumpuser -lpthread
.include <bsd.test.mk>
Index: src/usr.sbin/puffs/rump_ext2fs/Makefile
diff -u src/usr.sbin/puffs/rump_ext2fs/Makefile:1.4 src/usr.sbin/puffs/rump_ext2fs/Makefile:1.5
--- src/usr.sbin/puffs/rump_ext2fs/Makefile:1.4 Tue Dec 30 22:20:56 2008
+++ src/usr.sbin/puffs/rump_ext2fs/Makefile Sat May 2 01:15:53 2009
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2008/12/30 22:20:56 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/02 01:15:53 pooka Exp $
#
.include <bsd.own.mk>
-.undef RUMPKMOD
MOUNTNAME= ext2fs
-LDADD+= -lrumpfs_ufs -lrumpfs_ffs
-DPADD+= ${LIBRUMPFS_UFS} ${LIBRUMPFS_FFS}
+LDADD+= -lrumpfs_ffs
+DPADD+= ${LIBRUMPFS_FFS}
ISRUMP= # yea baby
Index: src/usr.sbin/puffs/rump_ffs/Makefile
diff -u src/usr.sbin/puffs/rump_ffs/Makefile:1.3 src/usr.sbin/puffs/rump_ffs/Makefile:1.4
--- src/usr.sbin/puffs/rump_ffs/Makefile:1.3 Tue Dec 30 22:20:56 2008
+++ src/usr.sbin/puffs/rump_ffs/Makefile Sat May 2 01:15:53 2009
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2008/12/30 22:20:56 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/02 01:15:53 pooka Exp $
#
.include <bsd.own.mk>
-.undef RUMPKMOD
MOUNTNAME= ffs
-LDADD+= -lrumpfs_ffs -lrumpfs_ufs
-DPADD+= ${LIBRUMPFS_FFS} ${LIBRUMPFS_UFS}
-
ISRUMP= # affirmative
.include <bsd.prog.mk>
Index: src/usr.sbin/puffs/rump_lfs/Makefile
diff -u src/usr.sbin/puffs/rump_lfs/Makefile:1.3 src/usr.sbin/puffs/rump_lfs/Makefile:1.4
--- src/usr.sbin/puffs/rump_lfs/Makefile:1.3 Tue Dec 30 22:20:56 2008
+++ src/usr.sbin/puffs/rump_lfs/Makefile Sat May 2 01:15:53 2009
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2008/12/30 22:20:56 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/02 01:15:53 pooka Exp $
#
.include <bsd.own.mk>
-.undef RUMPKMOD
MOUNTNAME= lfs
-LDADD+= -lrumpfs_lfs -lrumpfs_ufs -lrumpfs_ffs
-DPADD+= ${LIBRUMPFS_LFS} ${LIBRUMPFS_UFS} ${LIBRUMPFS_FFS}
+LDADD+= -lrumpfs_ffs
+DPADD+= ${LIBRUMPFS_FFS}
ISRUMP= # don't deny it
