diff options
| author |   natano <natano@openbsd.org> | 2016-10-17 14:06:32 +0000 |
|---|---|---|
| committer | natano <natano@openbsd.org> | 2016-10-17 14:06:32 +0000 |
| commit | 567f5890d530950cf47e371afbf903f92508ad6c (patch) | |
| tree | 00e22fa448c7b73830f791ae17cea39b85b04366 /usr.sbin/makefs | |
| parent | Tweak /etc/ldap/certs/ FILES entry. (diff) | |
| download | wireguard-openbsd-567f5890d530950cf47e371afbf903f92508ad6c.tar.xz wireguard-openbsd-567f5890d530950cf47e371afbf903f92508ad6c.zip | |
Remove apple ufs bits.
Diffstat (limited to 'usr.sbin/makefs')
| -rw-r--r-- | usr.sbin/makefs/ufs/ffs/fs.h | 26 | ||||
| -rw-r--r-- | usr.sbin/makefs/ufs/ufs/dinode.h | 8 | ||||
| -rw-r--r-- | usr.sbin/makefs/ufs/ufs/dir.h | 3 |
3 files changed, 3 insertions, 34 deletions
diff --git a/usr.sbin/makefs/ufs/ffs/fs.h b/usr.sbin/makefs/ufs/ffs/fs.h index 5abffdf534e..5f12f5448d7 100644 --- a/usr.sbin/makefs/ufs/ffs/fs.h +++ b/usr.sbin/makefs/ufs/ffs/fs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fs.h,v 1.2 2016/10/16 20:26:56 natano Exp $ */ +/* $OpenBSD: fs.h,v 1.3 2016/10/17 14:06:32 natano Exp $ */ /* $NetBSD: fs.h,v 1.66 2015/02/14 09:06:11 maxv Exp $ */ /* @@ -716,29 +716,5 @@ struct ocg { */ #define FFS_NINDIR(fs) ((fs)->fs_nindir) -/* - * Apple UFS Label: - * We check for this to decide to use APPLEUFS_DIRBLKSIZ - */ -#define APPLEUFS_LABEL_MAGIC 0x4c41424c /* LABL */ -#define APPLEUFS_LABEL_SIZE 1024 -#define APPLEUFS_LABEL_OFFSET (BBSIZE - APPLEUFS_LABEL_SIZE) /* located at 7k */ -#define APPLEUFS_LABEL_VERSION 1 -#define APPLEUFS_MAX_LABEL_NAME 512 - -struct appleufslabel { - u_int32_t ul_magic; - u_int16_t ul_checksum; - u_int16_t ul_unused0; - u_int32_t ul_version; - u_int32_t ul_time; - u_int16_t ul_namelen; - u_char ul_name[APPLEUFS_MAX_LABEL_NAME]; /* Warning: may not be null terminated */ - u_int16_t ul_unused1; - u_int64_t ul_uuid; /* Note this is only 4 byte aligned */ - u_char ul_reserved[24]; - u_char ul_unused[460]; -} __packed; - #endif /* !_UFS_FFS_FS_H_ */ diff --git a/usr.sbin/makefs/ufs/ufs/dinode.h b/usr.sbin/makefs/ufs/ufs/dinode.h index a057e2e34df..d32fd09b370 100644 --- a/usr.sbin/makefs/ufs/ufs/dinode.h +++ b/usr.sbin/makefs/ufs/ufs/dinode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dinode.h,v 1.2 2016/10/16 20:26:56 natano Exp $ */ +/* $OpenBSD: dinode.h,v 1.3 2016/10/17 14:06:32 natano Exp $ */ /* $NetBSD: dinode.h,v 1.25 2016/01/22 23:06:10 dholland Exp $ */ /* @@ -145,12 +145,6 @@ struct ufs2_dinode { ((ip)->i_ump->um_fstype == UFS1) ? \ UFS1_MAXSYMLINKLEN : UFS2_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. */ diff --git a/usr.sbin/makefs/ufs/ufs/dir.h b/usr.sbin/makefs/ufs/ufs/dir.h index aa3e0d33e11..fd849fddf13 100644 --- a/usr.sbin/makefs/ufs/ufs/dir.h +++ b/usr.sbin/makefs/ufs/ufs/dir.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.h,v 1.3 2016/10/16 21:59:28 tedu Exp $ */ +/* $OpenBSD: dir.h,v 1.4 2016/10/17 14:06:32 natano Exp $ */ /* $NetBSD: dir.h,v 1.25 2015/09/01 06:16:03 dholland Exp $ */ /* @@ -76,7 +76,6 @@ #undef UFS_DIRBLKSIZ #define UFS_DIRBLKSIZ DEV_BSIZE #define FFS_MAXNAMLEN 255 -#define APPLEUFS_DIRBLKSIZ 1024 #define d_ino d_fileno struct direct { |