Module Name: src
Committed By: bouyer
Date: Fri Feb 18 14:45:59 UTC 2011
Modified Files:
src/sys/rump/fs/lib/libffs [bouyer-quota2]: Makefile
src/sys/rump/librump/rumpvfs [bouyer-quota2]: Makefile.rumpvfs
src/sys/ufs [bouyer-quota2]: files.ufs
Log Message:
quota2_subr.c is not used outside of ufs_quota2.c in kernel, so make it
compiled conditionally on QUOTA2 again
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.2 -r1.12.4.3 src/sys/rump/fs/lib/libffs/Makefile
cvs rdiff -u -r1.28.4.1 -r1.28.4.2 \
src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
cvs rdiff -u -r1.24.6.4 -r1.24.6.5 src/sys/ufs/files.ufs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libffs/Makefile
diff -u src/sys/rump/fs/lib/libffs/Makefile:1.12.4.2 src/sys/rump/fs/lib/libffs/Makefile:1.12.4.3
--- src/sys/rump/fs/lib/libffs/Makefile:1.12.4.2 Tue Feb 15 16:45:57 2011
+++ src/sys/rump/fs/lib/libffs/Makefile Fri Feb 18 14:45:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12.4.2 2011/02/15 16:45:57 bouyer Exp $
+# $NetBSD: Makefile,v 1.12.4.3 2011/02/18 14:45:59 bouyer Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ffs ${.CURDIR}/../../../../ufs/ufs
@@ -11,7 +11,7 @@
SRCS+= ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_ihash.c ufs_inode.c \
ufs_lookup.c ufs_vfsops.c ufs_vnops.c ufs_wapbl.c \
- ufs_quota.c ufs_quota2.c
+ ufs_quota.c ufs_quota2.c quota2_subr.c
CPPFLAGS+= -DFFS_EI -DUFS_DIRHASH -DWAPBL -DAPPLE_UFS -DUFS_EXTATTR \
-DQUOTA2
Index: src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.28.4.1 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.28.4.2
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.28.4.1 Tue Feb 15 16:45:57 2011
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Fri Feb 18 14:45:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpvfs,v 1.28.4.1 2011/02/15 16:45:57 bouyer Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.28.4.2 2011/02/18 14:45:59 bouyer Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -51,7 +51,7 @@
SRCS+= mfs_miniroot.c
#quota2 plists
-SRCS+= quota1_subr.c quota2_subr.c quota2_prop.c
+SRCS+= quota1_subr.c quota2_prop.c
# dev
# firmload is technically part of rumpdev, but it's pure vfs in nature.
Index: src/sys/ufs/files.ufs
diff -u src/sys/ufs/files.ufs:1.24.6.4 src/sys/ufs/files.ufs:1.24.6.5
--- src/sys/ufs/files.ufs:1.24.6.4 Tue Feb 15 16:45:57 2011
+++ src/sys/ufs/files.ufs Fri Feb 18 14:45:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.ufs,v 1.24.6.4 2011/02/15 16:45:57 bouyer Exp $
+# $NetBSD: files.ufs,v 1.24.6.5 2011/02/18 14:45:59 bouyer Exp $
deffs FFS
deffs EXT2FS
@@ -63,7 +63,7 @@
file ufs/ufs/ufs_quota1.c quota & (ffs | lfs | mfs | ext2fs)
file ufs/ufs/ufs_quota2.c quota2 & (ffs | lfs | mfs | ext2fs)
file ufs/ufs/quota1_subr.c
-file ufs/ufs/quota2_subr.c
+file ufs/ufs/quota2_subr.c quota2 & (ffs | lfs | mfs | ext2fs)
file ufs/ufs/quota2_prop.c
file ufs/ufs/ufs_vfsops.c ffs | lfs | mfs | ext2fs
file ufs/ufs/ufs_vnops.c ffs | lfs | mfs | ext2fs
