diff options
author | Al Viro <viro@www.linux.org.uk> | 2005-05-01 11:59:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 11:59:18 -0400 |
commit | 3e8962be915bacc1d70e4849a075041838d60a3f (patch) | |
tree | e2ef686fa0a18a429456b252ed9352cdc1ae65de /include | |
parent | 6a3a16f2ef6f335286e2b2bf8284b0ab4ff38ec0 (diff) |
[PATCH] reiserfs endianness: annotate little-endian objects
little-endian objects annotated as such; again, obviously no changes of
resulting code, we only replace __u16 with __le16, etc. in relevant places.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Cc: <reiserfs-dev@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/reiserfs_acl.h | 12 | ||||
-rw-r--r-- | include/linux/reiserfs_fs.h | 168 | ||||
-rw-r--r-- | include/linux/reiserfs_xattr.h | 4 |
3 files changed, 92 insertions, 92 deletions
diff --git a/include/linux/reiserfs_acl.h b/include/linux/reiserfs_acl.h index a57e973af0b..2aef9c3f5ce 100644 --- a/include/linux/reiserfs_acl.h +++ b/include/linux/reiserfs_acl.h | |||
@@ -5,18 +5,18 @@ | |||
5 | #define REISERFS_ACL_VERSION 0x0001 | 5 | #define REISERFS_ACL_VERSION 0x0001 |
6 | 6 | ||
7 | typedef struct { | 7 | typedef struct { |
8 | __u16 e_tag; | 8 | __le16 e_tag; |
9 | __u16 e_perm; | 9 | __le16 e_perm; |
10 | __u32 e_id; | 10 | __le32 e_id; |
11 | } reiserfs_acl_entry; | 11 | } reiserfs_acl_entry; |
12 | 12 | ||
13 | typedef struct { | 13 | typedef struct { |
14 | __u16 e_tag; | 14 | __le16 e_tag; |
15 | __u16 e_perm; | 15 | __le16 e_perm; |
16 | } reiserfs_acl_entry_short; | 16 | } reiserfs_acl_entry_short; |
17 | 17 | ||
18 | typedef struct { | 18 | typedef struct { |
19 | __u32 a_version; | 19 | __le32 a_version; |
20 | } reiserfs_acl_header; | 20 | } reiserfs_acl_header; |
21 | 21 | ||
22 | static inline size_t reiserfs_acl_size(int count) | 22 | static inline size_t reiserfs_acl_size(int count) |
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index d0867873a1b..cc39c5305b8 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h | |||
@@ -114,47 +114,47 @@ if( !( cond ) ) \ | |||
114 | 114 | ||
115 | 115 | ||
116 | struct journal_params { | 116 | struct journal_params { |
117 | __u32 jp_journal_1st_block; /* where does journal start from on its | 117 | __le32 jp_journal_1st_block; /* where does journal start from on its |
118 | * device */ | 118 | * device */ |
119 | __u32 jp_journal_dev; /* journal device st_rdev */ | 119 | __le32 jp_journal_dev; /* journal device st_rdev */ |
120 | __u32 jp_journal_size; /* size of the journal */ | 120 | __le32 jp_journal_size; /* size of the journal */ |
121 | __u32 jp_journal_trans_max; /* max number of blocks in a transaction. */ | 121 | __le32 jp_journal_trans_max; /* max number of blocks in a transaction. */ |
122 | __u32 jp_journal_magic; /* random value made on fs creation (this | 122 | __le32 jp_journal_magic; /* random value made on fs creation (this |
123 | * was sb_journal_block_count) */ | 123 | * was sb_journal_block_count) */ |
124 | __u32 jp_journal_max_batch; /* max number of blocks to batch into a | 124 | __le32 jp_journal_max_batch; /* max number of blocks to batch into a |
125 | * trans */ | 125 | * trans */ |
126 | __u32 jp_journal_max_commit_age; /* in seconds, how old can an async | 126 | __le32 jp_journal_max_commit_age; /* in seconds, how old can an async |
127 | * commit be */ | 127 | * commit be */ |
128 | __u32 jp_journal_max_trans_age; /* in seconds, how old can a transaction | 128 | __le32 jp_journal_max_trans_age; /* in seconds, how old can a transaction |
129 | * be */ | 129 | * be */ |
130 | }; | 130 | }; |
131 | 131 | ||
132 | /* this is the super from 3.5.X, where X >= 10 */ | 132 | /* this is the super from 3.5.X, where X >= 10 */ |
133 | struct reiserfs_super_block_v1 | 133 | struct reiserfs_super_block_v1 |
134 | { | 134 | { |
135 | __u32 s_block_count; /* blocks count */ | 135 | __le32 s_block_count; /* blocks count */ |
136 | __u32 s_free_blocks; /* free blocks count */ | 136 | __le32 s_free_blocks; /* free blocks count */ |
137 | __u32 s_root_block; /* root block number */ | 137 | __le32 s_root_block; /* root block number */ |
138 | struct journal_params s_journal; | 138 | struct journal_params s_journal; |
139 | __u16 s_blocksize; /* block size */ | 139 | __le16 s_blocksize; /* block size */ |
140 | __u16 s_oid_maxsize; /* max size of object id array, see | 140 | __le16 s_oid_maxsize; /* max size of object id array, see |
141 | * get_objectid() commentary */ | 141 | * get_objectid() commentary */ |
142 | __u16 s_oid_cursize; /* current size of object id array */ | 142 | __le16 s_oid_cursize; /* current size of object id array */ |
143 | __u16 s_umount_state; /* this is set to 1 when filesystem was | 143 | __le16 s_umount_state; /* this is set to 1 when filesystem was |
144 | * umounted, to 2 - when not */ | 144 | * umounted, to 2 - when not */ |
145 | char s_magic[10]; /* reiserfs magic string indicates that | 145 | char s_magic[10]; /* reiserfs magic string indicates that |
146 | * file system is reiserfs: | 146 | * file system is reiserfs: |
147 | * "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs" */ | 147 | * "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs" */ |
148 | __u16 s_fs_state; /* it is set to used by fsck to mark which | 148 | __le16 s_fs_state; /* it is set to used by fsck to mark which |
149 | * phase of rebuilding is done */ | 149 | * phase of rebuilding is done */ |
150 | __u32 s_hash_function_code; /* indicate, what hash function is being use | 150 | __le32 s_hash_function_code; /* indicate, what hash function is being use |
151 | * to sort names in a directory*/ | 151 | * to sort names in a directory*/ |
152 | __u16 s_tree_height; /* height of disk tree */ | 152 | __le16 s_tree_height; /* height of disk tree */ |
153 | __u16 s_bmap_nr; /* amount of bitmap blocks needed to address | 153 | __le16 s_bmap_nr; /* amount of bitmap blocks needed to address |
154 | * each block of file system */ | 154 | * each block of file system */ |
155 | __u16 s_version; /* this field is only reliable on filesystem | 155 | __le16 s_version; /* this field is only reliable on filesystem |
156 | * with non-standard journal */ | 156 | * with non-standard journal */ |
157 | __u16 s_reserved_for_journal; /* size in blocks of journal area on main | 157 | __le16 s_reserved_for_journal; /* size in blocks of journal area on main |
158 | * device, we need to keep after | 158 | * device, we need to keep after |
159 | * making fs with non-standard journal */ | 159 | * making fs with non-standard journal */ |
160 | } __attribute__ ((__packed__)); | 160 | } __attribute__ ((__packed__)); |
@@ -165,8 +165,8 @@ struct reiserfs_super_block_v1 | |||
165 | struct reiserfs_super_block | 165 | struct reiserfs_super_block |
166 | { | 166 | { |
167 | struct reiserfs_super_block_v1 s_v1; | 167 | struct reiserfs_super_block_v1 s_v1; |
168 | __u32 s_inode_generation; | 168 | __le32 s_inode_generation; |
169 | __u32 s_flags; /* Right now used only by inode-attributes, if enabled */ | 169 | __le32 s_flags; /* Right now used only by inode-attributes, if enabled */ |
170 | unsigned char s_uuid[16]; /* filesystem unique identifier */ | 170 | unsigned char s_uuid[16]; /* filesystem unique identifier */ |
171 | unsigned char s_label[16]; /* filesystem volume label */ | 171 | unsigned char s_label[16]; /* filesystem volume label */ |
172 | char s_unused[88] ; /* zero filled by mkreiserfs and | 172 | char s_unused[88] ; /* zero filled by mkreiserfs and |
@@ -269,7 +269,7 @@ int is_reiserfs_jr (struct reiserfs_super_block * rs); | |||
269 | #define QUOTA_EXCEEDED -6 | 269 | #define QUOTA_EXCEEDED -6 |
270 | 270 | ||
271 | typedef __u32 b_blocknr_t; | 271 | typedef __u32 b_blocknr_t; |
272 | typedef __u32 unp_t; | 272 | typedef __le32 unp_t; |
273 | 273 | ||
274 | struct unfm_nodeinfo { | 274 | struct unfm_nodeinfo { |
275 | unp_t unfm_nodenum; | 275 | unp_t unfm_nodenum; |
@@ -376,8 +376,8 @@ static inline struct reiserfs_sb_info *REISERFS_SB(const struct super_block *sb) | |||
376 | // directories use this key as well as old files | 376 | // directories use this key as well as old files |
377 | // | 377 | // |
378 | struct offset_v1 { | 378 | struct offset_v1 { |
379 | __u32 k_offset; | 379 | __le32 k_offset; |
380 | __u32 k_uniqueness; | 380 | __le32 k_uniqueness; |
381 | } __attribute__ ((__packed__)); | 381 | } __attribute__ ((__packed__)); |
382 | 382 | ||
383 | struct offset_v2 { | 383 | struct offset_v2 { |
@@ -453,9 +453,9 @@ struct in_core_offset_v2 { | |||
453 | /* Key of an item determines its location in the S+tree, and | 453 | /* Key of an item determines its location in the S+tree, and |
454 | is composed of 4 components */ | 454 | is composed of 4 components */ |
455 | struct reiserfs_key { | 455 | struct reiserfs_key { |
456 | __u32 k_dir_id; /* packing locality: by default parent | 456 | __le32 k_dir_id; /* packing locality: by default parent |
457 | directory object id */ | 457 | directory object id */ |
458 | __u32 k_objectid; /* object identifier */ | 458 | __le32 k_objectid; /* object identifier */ |
459 | union { | 459 | union { |
460 | struct offset_v1 k_offset_v1; | 460 | struct offset_v1 k_offset_v1; |
461 | struct offset_v2 k_offset_v2; | 461 | struct offset_v2 k_offset_v2; |
@@ -534,15 +534,15 @@ struct item_head | |||
534 | item. Note that the key, not this field, is used to | 534 | item. Note that the key, not this field, is used to |
535 | determine the item type, and thus which field this | 535 | determine the item type, and thus which field this |
536 | union contains. */ | 536 | union contains. */ |
537 | __u16 ih_free_space_reserved; | 537 | __le16 ih_free_space_reserved; |
538 | /* Iff this is a directory item, this field equals the | 538 | /* Iff this is a directory item, this field equals the |
539 | number of directory entries in the directory item. */ | 539 | number of directory entries in the directory item. */ |
540 | __u16 ih_entry_count; | 540 | __le16 ih_entry_count; |
541 | } __attribute__ ((__packed__)) u; | 541 | } __attribute__ ((__packed__)) u; |
542 | __u16 ih_item_len; /* total size of the item body */ | 542 | __le16 ih_item_len; /* total size of the item body */ |
543 | __u16 ih_item_location; /* an offset to the item body | 543 | __le16 ih_item_location; /* an offset to the item body |
544 | * within the block */ | 544 | * within the block */ |
545 | __u16 ih_version; /* 0 for all old items, 2 for new | 545 | __le16 ih_version; /* 0 for all old items, 2 for new |
546 | ones. Highest bit is set by fsck | 546 | ones. Highest bit is set by fsck |
547 | temporary, cleaned after all | 547 | temporary, cleaned after all |
548 | done */ | 548 | done */ |
@@ -778,10 +778,10 @@ extern struct reiserfs_key root_key; | |||
778 | /* Header of a disk block. More precisely, header of a formatted leaf | 778 | /* Header of a disk block. More precisely, header of a formatted leaf |
779 | or internal node, and not the header of an unformatted node. */ | 779 | or internal node, and not the header of an unformatted node. */ |
780 | struct block_head { | 780 | struct block_head { |
781 | __u16 blk_level; /* Level of a block in the tree. */ | 781 | __le16 blk_level; /* Level of a block in the tree. */ |
782 | __u16 blk_nr_item; /* Number of keys/items in a block. */ | 782 | __le16 blk_nr_item; /* Number of keys/items in a block. */ |
783 | __u16 blk_free_space; /* Block free space in bytes. */ | 783 | __le16 blk_free_space; /* Block free space in bytes. */ |
784 | __u16 blk_reserved; | 784 | __le16 blk_reserved; |
785 | /* dump this in v4/planA */ | 785 | /* dump this in v4/planA */ |
786 | struct reiserfs_key blk_right_delim_key; /* kept only for compatibility */ | 786 | struct reiserfs_key blk_right_delim_key; /* kept only for compatibility */ |
787 | }; | 787 | }; |
@@ -845,19 +845,19 @@ struct block_head { | |||
845 | // | 845 | // |
846 | struct stat_data_v1 | 846 | struct stat_data_v1 |
847 | { | 847 | { |
848 | __u16 sd_mode; /* file type, permissions */ | 848 | __le16 sd_mode; /* file type, permissions */ |
849 | __u16 sd_nlink; /* number of hard links */ | 849 | __le16 sd_nlink; /* number of hard links */ |
850 | __u16 sd_uid; /* owner */ | 850 | __le16 sd_uid; /* owner */ |
851 | __u16 sd_gid; /* group */ | 851 | __le16 sd_gid; /* group */ |
852 | __u32 sd_size; /* file size */ | 852 | __le32 sd_size; /* file size */ |
853 | __u32 sd_atime; /* time of last access */ | 853 | __le32 sd_atime; /* time of last access */ |
854 | __u32 sd_mtime; /* time file was last modified */ | 854 | __le32 sd_mtime; /* time file was last modified */ |
855 | __u32 sd_ctime; /* time inode (stat data) was last changed (except changes to sd_atime and sd_mtime) */ | 855 | __le32 sd_ctime; /* time inode (stat data) was last changed (except changes to sd_atime and sd_mtime) */ |
856 | union { | 856 | union { |
857 | __u32 sd_rdev; | 857 | __le32 sd_rdev; |
858 | __u32 sd_blocks; /* number of blocks file uses */ | 858 | __le32 sd_blocks; /* number of blocks file uses */ |
859 | } __attribute__ ((__packed__)) u; | 859 | } __attribute__ ((__packed__)) u; |
860 | __u32 sd_first_direct_byte; /* first byte of file which is stored | 860 | __le32 sd_first_direct_byte; /* first byte of file which is stored |
861 | in a direct item: except that if it | 861 | in a direct item: except that if it |
862 | equals 1 it is a symlink and if it | 862 | equals 1 it is a symlink and if it |
863 | equals ~(__u32)0 there is no | 863 | equals ~(__u32)0 there is no |
@@ -923,20 +923,20 @@ struct stat_data_v1 | |||
923 | /* Stat Data on disk (reiserfs version of UFS disk inode minus the | 923 | /* Stat Data on disk (reiserfs version of UFS disk inode minus the |
924 | address blocks) */ | 924 | address blocks) */ |
925 | struct stat_data { | 925 | struct stat_data { |
926 | __u16 sd_mode; /* file type, permissions */ | 926 | __le16 sd_mode; /* file type, permissions */ |
927 | __u16 sd_attrs; /* persistent inode flags */ | 927 | __le16 sd_attrs; /* persistent inode flags */ |
928 | __u32 sd_nlink; /* number of hard links */ | 928 | __le32 sd_nlink; /* number of hard links */ |
929 | __u64 sd_size; /* file size */ | 929 | __le64 sd_size; /* file size */ |
930 | __u32 sd_uid; /* owner */ | 930 | __le32 sd_uid; /* owner */ |
931 | __u32 sd_gid; /* group */ | 931 | __le32 sd_gid; /* group */ |
932 | __u32 sd_atime; /* time of last access */ | 932 | __le32 sd_atime; /* time of last access */ |
933 | __u32 sd_mtime; /* time file was last modified */ | 933 | __le32 sd_mtime; /* time file was last modified */ |
934 | __u32 sd_ctime; /* time inode (stat data) was last changed (except changes to sd_atime and sd_mtime) */ | 934 | __le32 sd_ctime; /* time inode (stat data) was last changed (except changes to sd_atime and sd_mtime) */ |
935 | __u32 sd_blocks; | 935 | __le32 sd_blocks; |
936 | union { | 936 | union { |
937 | __u32 sd_rdev; | 937 | __le32 sd_rdev; |
938 | __u32 sd_generation; | 938 | __le32 sd_generation; |
939 | //__u32 sd_first_direct_byte; | 939 | //__le32 sd_first_direct_byte; |
940 | /* first byte of file which is stored in a | 940 | /* first byte of file which is stored in a |
941 | direct item: except that if it equals 1 | 941 | direct item: except that if it equals 1 |
942 | it is a symlink and if it equals | 942 | it is a symlink and if it equals |
@@ -1019,12 +1019,12 @@ struct stat_data { | |||
1019 | 1019 | ||
1020 | struct reiserfs_de_head | 1020 | struct reiserfs_de_head |
1021 | { | 1021 | { |
1022 | __u32 deh_offset; /* third component of the directory entry key */ | 1022 | __le32 deh_offset; /* third component of the directory entry key */ |
1023 | __u32 deh_dir_id; /* objectid of the parent directory of the object, that is referenced | 1023 | __le32 deh_dir_id; /* objectid of the parent directory of the object, that is referenced |
1024 | by directory entry */ | 1024 | by directory entry */ |
1025 | __u32 deh_objectid; /* objectid of the object, that is referenced by directory entry */ | 1025 | __le32 deh_objectid; /* objectid of the object, that is referenced by directory entry */ |
1026 | __u16 deh_location; /* offset of name in the whole item */ | 1026 | __le16 deh_location; /* offset of name in the whole item */ |
1027 | __u16 deh_state; /* whether 1) entry contains stat data (for future), and 2) whether | 1027 | __le16 deh_state; /* whether 1) entry contains stat data (for future), and 2) whether |
1028 | entry is hidden (unlinked) */ | 1028 | entry is hidden (unlinked) */ |
1029 | } __attribute__ ((__packed__)); | 1029 | } __attribute__ ((__packed__)); |
1030 | #define DEH_SIZE sizeof(struct reiserfs_de_head) | 1030 | #define DEH_SIZE sizeof(struct reiserfs_de_head) |
@@ -1084,10 +1084,10 @@ struct reiserfs_de_head | |||
1084 | #define de_visible(deh) test_bit_unaligned (DEH_Visible, &((deh)->deh_state)) | 1084 | #define de_visible(deh) test_bit_unaligned (DEH_Visible, &((deh)->deh_state)) |
1085 | #define de_hidden(deh) !test_bit_unaligned (DEH_Visible, &((deh)->deh_state)) | 1085 | #define de_hidden(deh) !test_bit_unaligned (DEH_Visible, &((deh)->deh_state)) |
1086 | 1086 | ||
1087 | extern void make_empty_dir_item_v1 (char * body, __u32 dirid, __u32 objid, | 1087 | extern void make_empty_dir_item_v1 (char * body, __le32 dirid, __le32 objid, |
1088 | __u32 par_dirid, __u32 par_objid); | 1088 | __le32 par_dirid, __le32 par_objid); |
1089 | extern void make_empty_dir_item (char * body, __u32 dirid, __u32 objid, | 1089 | extern void make_empty_dir_item (char * body, __le32 dirid, __le32 objid, |
1090 | __u32 par_dirid, __u32 par_objid); | 1090 | __le32 par_dirid, __le32 par_objid); |
1091 | 1091 | ||
1092 | /* array of the entry headers */ | 1092 | /* array of the entry headers */ |
1093 | /* get item body */ | 1093 | /* get item body */ |
@@ -1186,9 +1186,9 @@ struct reiserfs_dir_entry | |||
1186 | /* Disk child pointer: The pointer from an internal node of the tree | 1186 | /* Disk child pointer: The pointer from an internal node of the tree |
1187 | to a node that is on disk. */ | 1187 | to a node that is on disk. */ |
1188 | struct disk_child { | 1188 | struct disk_child { |
1189 | __u32 dc_block_number; /* Disk child's block number. */ | 1189 | __le32 dc_block_number; /* Disk child's block number. */ |
1190 | __u16 dc_size; /* Disk child's used space. */ | 1190 | __le16 dc_size; /* Disk child's used space. */ |
1191 | __u16 dc_reserved; | 1191 | __le16 dc_reserved; |
1192 | }; | 1192 | }; |
1193 | 1193 | ||
1194 | #define DC_SIZE (sizeof(struct disk_child)) | 1194 | #define DC_SIZE (sizeof(struct disk_child)) |
@@ -1656,10 +1656,10 @@ struct reiserfs_iget_args { | |||
1656 | 1656 | ||
1657 | /* first block written in a commit. */ | 1657 | /* first block written in a commit. */ |
1658 | struct reiserfs_journal_desc { | 1658 | struct reiserfs_journal_desc { |
1659 | __u32 j_trans_id ; /* id of commit */ | 1659 | __le32 j_trans_id ; /* id of commit */ |
1660 | __u32 j_len ; /* length of commit. len +1 is the commit block */ | 1660 | __le32 j_len ; /* length of commit. len +1 is the commit block */ |
1661 | __u32 j_mount_id ; /* mount id of this trans*/ | 1661 | __le32 j_mount_id ; /* mount id of this trans*/ |
1662 | __u32 j_realblock[1] ; /* real locations for each block */ | 1662 | __le32 j_realblock[1] ; /* real locations for each block */ |
1663 | } ; | 1663 | } ; |
1664 | 1664 | ||
1665 | #define get_desc_trans_id(d) le32_to_cpu((d)->j_trans_id) | 1665 | #define get_desc_trans_id(d) le32_to_cpu((d)->j_trans_id) |
@@ -1672,9 +1672,9 @@ struct reiserfs_journal_desc { | |||
1672 | 1672 | ||
1673 | /* last block written in a commit */ | 1673 | /* last block written in a commit */ |
1674 | struct reiserfs_journal_commit { | 1674 | struct reiserfs_journal_commit { |
1675 | __u32 j_trans_id ; /* must match j_trans_id from the desc block */ | 1675 | __le32 j_trans_id ; /* must match j_trans_id from the desc block */ |
1676 | __u32 j_len ; /* ditto */ | 1676 | __le32 j_len ; /* ditto */ |
1677 | __u32 j_realblock[1] ; /* real locations for each block */ | 1677 | __le32 j_realblock[1] ; /* real locations for each block */ |
1678 | } ; | 1678 | } ; |
1679 | 1679 | ||
1680 | #define get_commit_trans_id(c) le32_to_cpu((c)->j_trans_id) | 1680 | #define get_commit_trans_id(c) le32_to_cpu((c)->j_trans_id) |
@@ -1689,9 +1689,9 @@ struct reiserfs_journal_commit { | |||
1689 | ** and this transaction does not need to be replayed. | 1689 | ** and this transaction does not need to be replayed. |
1690 | */ | 1690 | */ |
1691 | struct reiserfs_journal_header { | 1691 | struct reiserfs_journal_header { |
1692 | __u32 j_last_flush_trans_id ; /* id of last fully flushed transaction */ | 1692 | __le32 j_last_flush_trans_id ; /* id of last fully flushed transaction */ |
1693 | __u32 j_first_unflushed_offset ; /* offset in the log of where to start replay after a crash */ | 1693 | __le32 j_first_unflushed_offset ; /* offset in the log of where to start replay after a crash */ |
1694 | __u32 j_mount_id ; | 1694 | __le32 j_mount_id ; |
1695 | /* 12 */ struct journal_params jh_journal; | 1695 | /* 12 */ struct journal_params jh_journal; |
1696 | } ; | 1696 | } ; |
1697 | 1697 | ||
@@ -2170,7 +2170,7 @@ void reiserfs_init_alloc_options (struct super_block *s); | |||
2170 | * to use for a new object underneat it. The locality is returned | 2170 | * to use for a new object underneat it. The locality is returned |
2171 | * in disk byte order (le). | 2171 | * in disk byte order (le). |
2172 | */ | 2172 | */ |
2173 | u32 reiserfs_choose_packing(struct inode *dir); | 2173 | __le32 reiserfs_choose_packing(struct inode *dir); |
2174 | 2174 | ||
2175 | int is_reusable (struct super_block * s, b_blocknr_t block, int bit_value); | 2175 | int is_reusable (struct super_block * s, b_blocknr_t block, int bit_value); |
2176 | void reiserfs_free_block (struct reiserfs_transaction_handle *th, struct inode *, b_blocknr_t, int for_unformatted); | 2176 | void reiserfs_free_block (struct reiserfs_transaction_handle *th, struct inode *, b_blocknr_t, int for_unformatted); |
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h index 1eaa48eca81..9244c574882 100644 --- a/include/linux/reiserfs_xattr.h +++ b/include/linux/reiserfs_xattr.h | |||
@@ -10,8 +10,8 @@ | |||
10 | #define REISERFS_XATTR_MAGIC 0x52465841 /* "RFXA" */ | 10 | #define REISERFS_XATTR_MAGIC 0x52465841 /* "RFXA" */ |
11 | 11 | ||
12 | struct reiserfs_xattr_header { | 12 | struct reiserfs_xattr_header { |
13 | __u32 h_magic; /* magic number for identification */ | 13 | __le32 h_magic; /* magic number for identification */ |
14 | __u32 h_hash; /* hash of the value */ | 14 | __le32 h_hash; /* hash of the value */ |
15 | }; | 15 | }; |
16 | 16 | ||
17 | #ifdef __KERNEL__ | 17 | #ifdef __KERNEL__ |