Module Name: src
Committed By: dholland
Date: Thu Jun 6 01:25:25 UTC 2013
Modified Files:
src/sys/ufs/lfs: ulfs_dinode.h ulfs_dir.h ulfsmount.h
Log Message:
Remove references to Apple UFS.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/lfs/ulfs_dinode.h
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/lfs/ulfs_dir.h
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/lfs/ulfsmount.h
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/lfs/ulfs_dinode.h
diff -u src/sys/ufs/lfs/ulfs_dinode.h:1.3 src/sys/ufs/lfs/ulfs_dinode.h:1.4
--- src/sys/ufs/lfs/ulfs_dinode.h:1.3 Thu Jun 6 00:51:50 2013
+++ src/sys/ufs/lfs/ulfs_dinode.h Thu Jun 6 01:25:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_dinode.h,v 1.3 2013/06/06 00:51:50 dholland Exp $ */
+/* $NetBSD: ulfs_dinode.h,v 1.4 2013/06/06 01:25:25 dholland Exp $ */
/* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */
/*
@@ -147,12 +147,6 @@ struct ulfs2_dinode {
((ip)->i_ump->um_fstype == ULFS1) ? \
ULFS1_MAXSYMLINKLEN : ULFS2_MAXSYMLINKLEN
-/* NeXT used to keep short symlinks in the inode even when using
- * FS_42INODEFMT. In that case fs->fs_maxsymlinklen is probably -1,
- * but short symlinks were stored in inodes shorter than this:
- */
-#define APPLEUFS_MAXSYMLINKLEN 60
-
/* File permissions. */
#define IEXEC 0000100 /* Executable. */
#define IWRITE 0000200 /* Writable. */
Index: src/sys/ufs/lfs/ulfs_dir.h
diff -u src/sys/ufs/lfs/ulfs_dir.h:1.2 src/sys/ufs/lfs/ulfs_dir.h:1.3
--- src/sys/ufs/lfs/ulfs_dir.h:1.2 Thu Jun 6 00:48:04 2013
+++ src/sys/ufs/lfs/ulfs_dir.h Thu Jun 6 01:25:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_dir.h,v 1.2 2013/06/06 00:48:04 dholland Exp $ */
+/* $NetBSD: ulfs_dir.h,v 1.3 2013/06/06 01:25:25 dholland Exp $ */
/* from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp */
/*
@@ -76,7 +76,6 @@
#undef DIRBLKSIZ
#define DIRBLKSIZ DEV_BSIZE
#define FFS_MAXNAMLEN 255
-#define APPLEUFS_DIRBLKSIZ 1024
#define d_ino d_fileno
struct direct {
Index: src/sys/ufs/lfs/ulfsmount.h
diff -u src/sys/ufs/lfs/ulfsmount.h:1.5 src/sys/ufs/lfs/ulfsmount.h:1.6
--- src/sys/ufs/lfs/ulfsmount.h:1.5 Thu Jun 6 00:51:25 2013
+++ src/sys/ufs/lfs/ulfsmount.h Thu Jun 6 01:25:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfsmount.h,v 1.5 2013/06/06 00:51:25 dholland Exp $ */
+/* $NetBSD: ulfsmount.h,v 1.6 2013/06/06 01:25:25 dholland Exp $ */
/* from NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */
/*
@@ -144,7 +144,7 @@ struct ulfs_ops {
/* ULFS-specific flags */
#define ULFS_NEEDSWAP 0x01 /* filesystem metadata need byte-swapping */
-#define ULFS_ISAPPLEUFS 0x02 /* filesystem is Apple UFS */
+/* unused 0x02 */
#define ULFS_QUOTA 0x04 /* filesystem has QUOTA (v1) */
#define ULFS_QUOTA2 0x08 /* filesystem has QUOTA2 */
@@ -164,12 +164,6 @@ struct ulfs_ops {
/* Convert mount ptr to ulfsmount ptr. */
#define VFSTOULFS(mp) ((struct ulfsmount *)((mp)->mnt_data))
-#if 0 /*def APPLE_UFS*/
-#define ULFS_MPISAPPLEUFS(ump) ((ump)->um_flags & ULFS_ISAPPLEUFS)
-#else
-#define ULFS_MPISAPPLEUFS(ump) (0)
-#endif
-
/*
* Macros to access file system parameters in the ulfsmount structure.
* Used by ulfs_bmap.
