Author: pfg
Date: Wed Nov 28 15:48:32 2012
New Revision: 243652
URL: http://svnweb.freebsd.org/changeset/base/243652
Log:
Update some definitions or make them match NetBSD's headers.
Bring several definitions required for newer ext4 features.
Rename EXT2F_COMPAT_HTREE to EXT2F_COMPAT_DIRHASHINDEX since it
is not being used yet and the new name is more compatible with
NetBSD and Linux.
This change is purely cosmetic and has no effect on the real
code.
Obtained from: NetBSD
MFC after: 3 days
Modified:
head/sys/fs/ext2fs/ext2_dinode.h
head/sys/fs/ext2fs/ext2fs.h
Modified: head/sys/fs/ext2fs/ext2_dinode.h
==============================================================================
--- head/sys/fs/ext2fs/ext2_dinode.h Wed Nov 28 13:34:44 2012
(r243651)
+++ head/sys/fs/ext2fs/ext2_dinode.h Wed Nov 28 15:48:32 2012
(r243652)
@@ -60,8 +60,15 @@
#define EXT2_APPEND 0x00000020 /* writes to file may only append */
#define EXT2_NODUMP 0x00000040 /* do not dump file */
#define EXT2_NOATIME 0x00000080 /* do not update atime */
-
-#define EXT2_HTREE 0x00001000 /* HTree-indexed directory */
+#define EXT2_INDEX 0x00001000 /* hash-indexed directory */
+#define EXT2_IMAGIC 0x00002000 /* AFS directory */
+#define EXT2_JOURNAL_DATA 0x00004000 /* file data should be
journaled */
+#define EXT2_NOTAIL 0x00008000 /* file tail should not be merged */
+#define EXT2_DIRSYNC 0x00010000 /* dirsync behaviour */
+#define EXT2_TOPDIR 0x00020000 /* Top of directory hierarchies*/
+#define EXT2_HUGE_FILE 0x00040000 /* Set to each huge file */
+#define EXT2_EXTENTS 0x00080000 /* Inode uses extents */
+#define EXT2_EOFBLOCKS 0x00400000 /* Blocks allocated beyond EOF */
/*
* Definitions for nanosecond timestamps.
@@ -95,9 +102,8 @@ struct ext2fs_dinode {
uint32_t e2di_facl; /* 104: file ACL (not implemented) */
uint32_t e2di_dacl; /* 108: dir ACL (not implemented) */
uint32_t e2di_faddr; /* 112: fragment address */
- uint8_t e2di_nfrag; /* 116: fragment number */
- uint8_t e2di_fsize; /* 117: fragment size */
- uint16_t e2di_linux_reserved2; /* 118 */
+ uint16_t e2di_nblock_high; /* 116: Blocks count bits 47:32 */
+ uint16_t e2di_facl_high; /* 118: file ACL bits 47:32 */
uint16_t e2di_uid_high; /* 120: Owner UID top 16 bits */
uint16_t e2di_gid_high; /* 122: Owner GID top 16 bits */
uint32_t e2di_linux_reserved3; /* 124 */
Modified: head/sys/fs/ext2fs/ext2fs.h
==============================================================================
--- head/sys/fs/ext2fs/ext2fs.h Wed Nov 28 13:34:44 2012 (r243651)
+++ head/sys/fs/ext2fs/ext2fs.h Wed Nov 28 15:48:32 2012 (r243652)
@@ -210,15 +210,23 @@ struct m_ext2fs {
#define EXT2F_COMPAT_PREALLOC 0x0001
#define EXT2F_COMPAT_HASJOURNAL 0x0004
#define EXT2F_COMPAT_RESIZE 0x0010
-#define EXT2F_COMPAT_HTREE 0x0020
+#define EXT2F_COMPAT_DIRHASHINDEX 0x0020
#define EXT2F_ROCOMPAT_SPARSESUPER 0x0001
#define EXT2F_ROCOMPAT_LARGEFILE 0x0002
#define EXT2F_ROCOMPAT_BTREE_DIR 0x0004
+#define EXT4F_ROCOMPAT_HUGE_FILE 0x0008
+#define EXT4F_ROCOMPAT_GDT_CSUM 0x0010
+#define EXT4F_ROCOMPAT_DIR_NLINK 0x0020
#define EXT4F_ROCOMPAT_EXTRA_ISIZE 0x0040
#define EXT2F_INCOMPAT_COMP 0x0001
#define EXT2F_INCOMPAT_FTYPE 0x0002
+#define EXT4F_INCOMPAT_META_BG 0x0010
+#define EXT4F_INCOMPAT_EXTENTS 0x0040
+#define EXT4F_INCOMPAT_64BIT 0x0080
+#define EXT4F_INCOMPAT_MMP 0x0100
+#define EXT4F_INCOMPAT_FLEX_BG 0x0200
/*
* Features supported in this implementation
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
