diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 16:16:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:16:10 -0800 |
| commit | 36c8c1039fca1c338796c4a8951c31e4fdf1d3b9 (patch) | |
| tree | fc661a73e7311d4b2cfceb47f3eb9228e16ab96b /libc/kernel/common/linux/loop.h | |
| parent | 27a5923b24a7f0a1a75498bcb6771f380b681e09 (diff) | |
| parent | 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd (diff) | |
| download | android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.tar.gz android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.tar.bz2 android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.zip | |
Merge "Revert "Update bionic kernel headers using update_all.py""
Diffstat (limited to 'libc/kernel/common/linux/loop.h')
| -rw-r--r-- | libc/kernel/common/linux/loop.h | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/libc/kernel/common/linux/loop.h b/libc/kernel/common/linux/loop.h index 94baeb250..9cdfd382a 100644 --- a/libc/kernel/common/linux/loop.h +++ b/libc/kernel/common/linux/loop.h @@ -7,84 +7,71 @@ *** 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 _LINUX_LOOP_H #define _LINUX_LOOP_H + #define LO_NAME_SIZE 64 #define LO_KEY_SIZE 32 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + enum { LO_FLAGS_READ_ONLY = 1, LO_FLAGS_USE_AOPS = 2, }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #include <asm/posix_types.h> #include <asm/types.h> + struct loop_info { int lo_number; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __kernel_old_dev_t lo_device; unsigned long lo_inode; __kernel_old_dev_t lo_rdevice; int lo_offset; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int lo_encrypt_type; int lo_encrypt_key_size; int lo_flags; char lo_name[LO_NAME_SIZE]; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned char lo_encrypt_key[LO_KEY_SIZE]; unsigned long lo_init[2]; char reserved[4]; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct loop_info64 { __u64 lo_device; __u64 lo_inode; __u64 lo_rdevice; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u64 lo_offset; __u64 lo_sizelimit; __u32 lo_number; __u32 lo_encrypt_type; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 lo_encrypt_key_size; __u32 lo_flags; __u8 lo_file_name[LO_NAME_SIZE]; __u8 lo_crypt_name[LO_NAME_SIZE]; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u8 lo_encrypt_key[LO_KEY_SIZE]; __u64 lo_init[2]; }; + #define LO_CRYPT_NONE 0 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define LO_CRYPT_XOR 1 #define LO_CRYPT_DES 2 #define LO_CRYPT_FISH2 3 #define LO_CRYPT_BLOW 4 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define LO_CRYPT_CAST128 5 #define LO_CRYPT_IDEA 6 #define LO_CRYPT_DUMMY 9 #define LO_CRYPT_SKIPJACK 10 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define LO_CRYPT_CRYPTOAPI 18 #define MAX_LO_CRYPT 20 + #define LOOP_SET_FD 0x4C00 #define LOOP_CLR_FD 0x4C01 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define LOOP_SET_STATUS 0x4C02 #define LOOP_GET_STATUS 0x4C03 #define LOOP_SET_STATUS64 0x4C04 #define LOOP_GET_STATUS64 0x4C05 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define LOOP_CHANGE_FD 0x4C06 + #endif |