Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
pooka 2009-05-02 01:15:52 +00:00
parent b79fe05de0
commit 45ef580f17
14 changed files with 29 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/sets/lists/base/shl.elf
View File

@ -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

4
distrib/sets/lists/base/shl.mi
View File

@ -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

8
distrib/sets/lists/comp/mi
View File

@ -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

4
distrib/sets/lists/comp/shl.mi
View File

@ -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

18
lib/libukfs/ukfs.c
View File

@ -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 @@ ukfs_lutimes(struct ukfs *ukfs, const char *filename,
* 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 @@ ukfs_modload(const char *fname)
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);

6
sys/rump/fs/Makefile.rumpfs
View File

@ -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

8
sys/rump/fs/lib/libffs/Makefile
View File

@ -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 @@ SRCS= ffs_alloc.c ffs_appleufs.c ffs_balloc.c ffs_bswap.c ffs_inode.c \
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>

14
sys/rump/fs/lib/libufs/Makefile
View File

@ -1,14 +0,0 @@
# $NetBSD: Makefile,v 1.7 2008/08/05 13:16:27 simonb Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ufs
LIB= rumpfs_ufs
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+= -DUFS_DIRHASH -DFFS_EI -DWAPBL -DAPPLE_UFS
.include <bsd.lib.mk>
.include <bsd.klinks.mk>

3
sys/rump/fs/lib/libufs/fs_ffs.h
View File

@ -1,3 +0,0 @@
/* $NetBSD: fs_ffs.h,v 1.1 2007/08/05 22:28:06 pooka Exp $ */
#define FFS

4
sys/rump/fs/lib/libufs/shlib_version
View File

@ -1,4 +0,0 @@
# $NetBSD: shlib_version,v 1.1 2008/07/29 13:17:47 pooka Exp $
#
major=0
minor=0

5
tests/fs/ffs/Makefile
View File

@ -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 @@ WARNS= 4
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>

7
usr.sbin/puffs/rump_ext2fs/Makefile
View File

@ -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

6
usr.sbin/puffs/rump_ffs/Makefile
View File

@ -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>

7
usr.sbin/puffs/rump_lfs/Makefile
View File

@ -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