lgcosta/reiserfsprogs
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reiserfscore: move endian helpers for offset_v2 into header

Browse Source 
We'll need to use these helpers from library callers.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
This commit is contained in:
Jeff Mahoney authored and Jeff Mahoney committed 2013-08-26 19:00:02 -04:00
1 parent 66af734015
commit ad42b07bcf
2 files changed
+51 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/reiserfs_fs.h
+51
View File
@@ -1550,6 +1550,57 @@ static inline void buffer_info_init_bh(struct tree_balance *tb,
bi->bi_parent = NULL;
bi->bi_position = 0;
}
#if __BYTE_ORDER == __LITTLE_ENDIAN
# define get_key_offset_v2(key) (__u64)(((key)->u.k2_offset_v2.k_offset))
# define set_key_offset_v2(key,val) (void)((key)->u.k2_offset_v2.k_offset = (val))
# define get_key_type_v2(key) (__u16)(((key)->u.k2_offset_v2.k_type))
# define set_key_type_v2(key,val) (void)((key)->u.k2_offset_v2.k_type = (val))
#elif __BYTE_ORDER == __BIG_ENDIAN
typedef union {
struct offset_v2 offset_v2;
__u64 linear;
} __attribute__ ((__packed__)) offset_v2_esafe_overlay;
static inline __u64 get_key_offset_v2(const struct reiserfs_key *key)
{
offset_v2_esafe_overlay tmp =
*(offset_v2_esafe_overlay *) (&(key->u.k2_offset_v2));
tmp.linear = le64_to_cpu(tmp.linear);
return tmp.offset_v2.k_offset;
}
static inline __u32 get_key_type_v2(const struct reiserfs_key *key)
{
offset_v2_esafe_overlay tmp =
*(offset_v2_esafe_overlay *) (&(key->u.k2_offset_v2));
tmp.linear = le64_to_cpu(tmp.linear);
return tmp.offset_v2.k_type;
}
static inline void set_key_offset_v2(struct reiserfs_key *key, __u64 offset)
{
offset_v2_esafe_overlay *tmp =
(offset_v2_esafe_overlay *) (&(key->u.k2_offset_v2));
tmp->linear = le64_to_cpu(tmp->linear);
tmp->offset_v2.k_offset = offset;
tmp->linear = cpu_to_le64(tmp->linear);
}
static inline void set_key_type_v2(struct reiserfs_key *key, __u32 type)
{
offset_v2_esafe_overlay *tmp =
(offset_v2_esafe_overlay *) (&(key->u.k2_offset_v2));
if (type > 15)
reiserfs_panic("set_key_type_v2: type is too big %d", type);
tmp->linear = le64_to_cpu(tmp->linear);
tmp->offset_v2.k_type = type;
tmp->linear = cpu_to_le64(tmp->linear);
}
#else
# error "nuxi/pdp-endian archs are not supported"
#endif
#endif
reiserfscore/node_formats.c
-51
View File
@@ -853,57 +853,6 @@ void for_every_item(struct buffer_head *bh, item_head_action_t action,
}
}
#if __BYTE_ORDER == __LITTLE_ENDIAN
# define get_key_offset_v2(key) (__u64)((key->u.k2_offset_v2.k_offset))
# define set_key_offset_v2(key,val) (void)(key->u.k2_offset_v2.k_offset = (val))
# define get_key_type_v2(key) (__u16)((key->u.k2_offset_v2.k_type))
# define set_key_type_v2(key,val) (void)(key->u.k2_offset_v2.k_type = (val))
#elif __BYTE_ORDER == __BIG_ENDIAN
typedef union {
struct offset_v2 offset_v2;
__u64 linear;
} __attribute__ ((__packed__)) offset_v2_esafe_overlay;
static inline __u64 get_key_offset_v2(const struct reiserfs_key *key)
{
offset_v2_esafe_overlay tmp =
*(offset_v2_esafe_overlay *) (&(key->u.k2_offset_v2));
tmp.linear = le64_to_cpu(tmp.linear);
return tmp.offset_v2.k_offset;
}
static inline __u32 get_key_type_v2(const struct reiserfs_key *key)
{
offset_v2_esafe_overlay tmp =
*(offset_v2_esafe_overlay *) (&(key->u.k2_offset_v2));
tmp.linear = le64_to_cpu(tmp.linear);
return tmp.offset_v2.k_type;
}
static inline void set_key_offset_v2(struct reiserfs_key *key, __u64 offset)
{
offset_v2_esafe_overlay *tmp =
(offset_v2_esafe_overlay *) (&(key->u.k2_offset_v2));
tmp->linear = le64_to_cpu(tmp->linear);
tmp->offset_v2.k_offset = offset;
tmp->linear = cpu_to_le64(tmp->linear);
}
static inline void set_key_type_v2(struct reiserfs_key *key, __u32 type)
{
offset_v2_esafe_overlay *tmp =
(offset_v2_esafe_overlay *) (&(key->u.k2_offset_v2));
if (type > 15)
reiserfs_panic("set_key_type_v2: type is too big %d", type);
tmp->linear = le64_to_cpu(tmp->linear);
tmp->offset_v2.k_type = type;
tmp->linear = cpu_to_le64(tmp->linear);
}
#else
# error "nuxi/pdp-endian archs are not supported"
#endif
static inline int is_key_format_1(int type)
{
return ((type == 0 || type == 15) ? 1 : 0);