diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 16:14:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:14:53 -0800 |
| commit | 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd (patch) | |
| tree | 81138dd64a4b9ea18c3cfd5c69783add6deeb201 /libc/kernel/common/linux/efs_dir.h | |
| parent | 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 (diff) | |
| download | android_bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.gz android_bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.bz2 android_bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.zip | |
Revert "Update bionic kernel headers using update_all.py"
This reverts commit 94a85f663694e1869acb1c2e8a3c374a6fa3ab86
There is a smoke test failure for Prime but Crespo/Stingray are fine. Will revert the change for now until further investigation is made.
Diffstat (limited to 'libc/kernel/common/linux/efs_dir.h')
| -rw-r--r-- | libc/kernel/common/linux/efs_dir.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/libc/kernel/common/linux/efs_dir.h b/libc/kernel/common/linux/efs_dir.h index 40991a36d..5be27625e 100644 --- a/libc/kernel/common/linux/efs_dir.h +++ b/libc/kernel/common/linux/efs_dir.h @@ -7,40 +7,39 @@ *** structures, and macros generated from the original header, and thus, *** contains no copyrightable information. *** - *** To edit the content of this header, modify the corresponding - *** source file (e.g. under external/kernel-headers/original/) then - *** run bionic/libc/kernel/tools/update_all.py - *** - *** Any manual change here will be lost the next time this script will - *** be run. You've been warned! - *** **************************************************************************** ****************************************************************************/ #ifndef __EFS_DIR_H__ #define __EFS_DIR_H__ + #define EFS_DIRBSIZE_BITS EFS_BLOCKSIZE_BITS #define EFS_DIRBSIZE (1 << EFS_DIRBSIZE_BITS) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct efs_dentry { __be32 inode; unsigned char namelen; char name[3]; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; + #define EFS_DENTSIZE (sizeof(struct efs_dentry) - 3 + 1) #define EFS_MAXNAMELEN ((1 << (sizeof(char) * 8)) - 1) + #define EFS_DIRBLK_HEADERSIZE 4 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define EFS_DIRBLK_MAGIC 0xbeef + struct efs_dir { __be16 magic; unsigned char firstused; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned char slots; + unsigned char space[EFS_DIRBSIZE - EFS_DIRBLK_HEADERSIZE]; }; + #define EFS_MAXENTS ((EFS_DIRBSIZE - EFS_DIRBLK_HEADERSIZE) / (EFS_DENTSIZE + sizeof(char))) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #define EFS_SLOTAT(dir, slot) EFS_REALOFF((dir)->space[slot]) + #define EFS_REALOFF(offset) ((offset << 1)) + #endif + |