Module Name: src
Committed By: pooka
Date: Tue Mar 2 15:18:22 UTC 2010
Modified Files:
src/sys/ufs: files.ufs
src/sys/ufs/ufs: ufs_lookup.c
Log Message:
Remove last #ifdef FFS. Do this by making lfs include ffs.
Could use UFS_OPS, but:
1) the lfs kernel module depends on full ffs already anway
2) lfs is being split from ufs, so this will automatically
go away soon
3) chances of anyone wanting an lfs-only kernel are pretty slim
4) i'm too lazy to figure out how to test ffs_snapgone() is
still called properly if I change the call ;)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/ufs/files.ufs
cvs rdiff -u -r1.103 -r1.104 src/sys/ufs/ufs/ufs_lookup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/files.ufs
diff -u src/sys/ufs/files.ufs:1.19 src/sys/ufs/files.ufs:1.20
--- src/sys/ufs/files.ufs:1.19 Sun Feb 22 20:28:06 2009
+++ src/sys/ufs/files.ufs Tue Mar 2 15:18:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.ufs,v 1.19 2009/02/22 20:28:06 ad Exp $
+# $NetBSD: files.ufs,v 1.20 2010/03/02 15:18:22 pooka Exp $
deffs fs_ffs.h FFS
deffs EXT2FS
@@ -22,15 +22,15 @@
file ufs/ext2fs/ext2fs_vfsops.c ext2fs
file ufs/ext2fs/ext2fs_vnops.c ext2fs
-file ufs/ffs/ffs_alloc.c ffs | mfs | ext2fs
-file ufs/ffs/ffs_balloc.c ffs | mfs | ext2fs
+file ufs/ffs/ffs_alloc.c ffs | lfs | mfs | ext2fs
+file ufs/ffs/ffs_balloc.c ffs | lfs | mfs | ext2fs
file ufs/ffs/ffs_bswap.c (ffs | mfs) & ffs_ei
-file ufs/ffs/ffs_inode.c ffs | mfs | ext2fs
-file ufs/ffs/ffs_snapshot.c ffs | mfs | ext2fs
-file ufs/ffs/ffs_subr.c ffs | mfs | ext2fs
-file ufs/ffs/ffs_tables.c ffs | mfs | ext2fs
-file ufs/ffs/ffs_vfsops.c ffs | mfs | ext2fs
-file ufs/ffs/ffs_vnops.c ffs | mfs | ext2fs
+file ufs/ffs/ffs_inode.c ffs | lfs | mfs | ext2fs
+file ufs/ffs/ffs_snapshot.c ffs | lfs | mfs | ext2fs
+file ufs/ffs/ffs_subr.c ffs | lfs | mfs | ext2fs
+file ufs/ffs/ffs_tables.c ffs | lfs | mfs | ext2fs
+file ufs/ffs/ffs_vfsops.c ffs | lfs | mfs | ext2fs
+file ufs/ffs/ffs_vnops.c ffs | lfs | mfs | ext2fs
file ufs/ffs/ffs_wapbl.c ffs & wapbl
file ufs/ffs/ffs_appleufs.c ffs & apple_ufs
Index: src/sys/ufs/ufs/ufs_lookup.c
diff -u src/sys/ufs/ufs/ufs_lookup.c:1.103 src/sys/ufs/ufs/ufs_lookup.c:1.104
--- src/sys/ufs/ufs/ufs_lookup.c:1.103 Fri Jan 8 11:35:12 2010
+++ src/sys/ufs/ufs/ufs_lookup.c Tue Mar 2 15:18:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_lookup.c,v 1.103 2010/01/08 11:35:12 pooka Exp $ */
+/* $NetBSD: ufs_lookup.c,v 1.104 2010/03/02 15:18:22 pooka Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,11 +37,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.103 2010/01/08 11:35:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.104 2010/03/02 15:18:22 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_ffs.h"
-#include "fs_ffs.h"
#endif
#include <sys/param.h>
@@ -1047,7 +1046,6 @@
}
error = VOP_BWRITE(bp);
dp->i_flag |= IN_CHANGE | IN_UPDATE;
-#ifdef FFS
/*
* If the last named reference to a snapshot goes away,
* drop its snapshot reference so that it will be reclaimed
@@ -1057,7 +1055,6 @@
ip->i_nlink == 0)
ffs_snapgone(ip);
UFS_WAPBL_UPDATE(dvp, NULL, NULL, 0);
-#endif
return (error);
}
@@ -1087,7 +1084,6 @@
UFS_WAPBL_UPDATE(ITOV(oip), NULL, NULL, UPDATE_DIROP);
error = VOP_BWRITE(bp);
dp->i_flag |= iflags;
-#ifdef FFS
/*
* If the last named reference to a snapshot goes away,
* drop its snapshot reference so that it will be reclaimed
@@ -1096,7 +1092,6 @@
if ((oip->i_flags & SF_SNAPSHOT) != 0 && oip->i_nlink == 0)
ffs_snapgone(oip);
UFS_WAPBL_UPDATE(vdp, NULL, NULL, UPDATE_DIROP);
-#endif
return (error);
}
