aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/blkid/probe.h
diff options
context:
space:
mode:
Diffstat (limited to 'e2fsprogs/blkid/probe.h')
-rw-r--r--e2fsprogs/blkid/probe.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/e2fsprogs/blkid/probe.h b/e2fsprogs/blkid/probe.h
index 10af5d518..530b8efe2 100644
--- a/e2fsprogs/blkid/probe.h
+++ b/e2fsprogs/blkid/probe.h
@@ -18,7 +18,7 @@
18 18
19struct blkid_magic; 19struct blkid_magic;
20 20
21typedef int (*blkid_probe_t)(int fd, blkid_cache cache, blkid_dev dev, 21typedef int (*blkid_probe_t)(int fd, blkid_cache cache, blkid_dev dev,
22 const struct blkid_magic *id, unsigned char *buf); 22 const struct blkid_magic *id, unsigned char *buf);
23 23
24struct blkid_magic { 24struct blkid_magic {
@@ -222,16 +222,16 @@ struct ocfs_volume_header {
222 222
223struct ocfs_volume_label { 223struct ocfs_volume_label {
224 unsigned char disk_lock[48]; 224 unsigned char disk_lock[48];
225 unsigned char label[64]; 225 unsigned char label[64];
226 unsigned char label_len[2]; 226 unsigned char label_len[2];
227 unsigned char vol_id[16]; 227 unsigned char vol_id[16];
228 unsigned char vol_id_len[2]; 228 unsigned char vol_id_len[2];
229}; 229};
230 230
231#define ocfsmajor(o) ((__u32)o.major_version[0] \ 231#define ocfsmajor(o) ((__u32)o.major_version[0] \
232 + (((__u32) o.major_version[1]) << 8) \ 232 + (((__u32) o.major_version[1]) << 8) \
233 + (((__u32) o.major_version[2]) << 16) \ 233 + (((__u32) o.major_version[2]) << 16) \
234 + (((__u32) o.major_version[3]) << 24)) 234 + (((__u32) o.major_version[3]) << 24))
235#define ocfslabellen(o) ((__u32)o.label_len[0] + (((__u32) o.label_len[1]) << 8)) 235#define ocfslabellen(o) ((__u32)o.label_len[0] + (((__u32) o.label_len[1]) << 8))
236#define ocfsmountlen(o) ((__u32)o.mount_len[0] + (((__u32) o.mount_len[1])<<8)) 236#define ocfsmountlen(o) ((__u32)o.mount_len[0] + (((__u32) o.mount_len[1])<<8))
237 237
@@ -334,7 +334,7 @@ _INLINE_ __u64 blkid_swab64(__u64 val)
334 return (blkid_swab32(val >> 32) | 334 return (blkid_swab32(val >> 32) |
335 (((__u64) blkid_swab32(val & 0xFFFFFFFFUL)) << 32)); 335 (((__u64) blkid_swab32(val & 0xFFFFFFFFUL)) << 32));
336} 336}
337#endif 337#endif
338 338
339 339
340 340