git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
fs
/
hfs
/
hfs.h
diff --git
a/fs/hfs/hfs.h
b/fs/hfs/hfs.h
index
88099ab
..
6f194d0
100644
(file)
--- a/
fs/hfs/hfs.h
+++ b/
fs/hfs/hfs.h
@@
-83,8
+83,6
@@
/*======== HFS structures as they appear on the disk ========*/
/*======== HFS structures as they appear on the disk ========*/
-#define __packed __attribute__ ((packed))
-
/* Pascal-style string of up to 31 characters */
struct hfs_name {
u8 len;
/* Pascal-style string of up to 31 characters */
struct hfs_name {
u8 len;
@@
-169,6
+167,9
@@
typedef union hfs_btree_key {
struct hfs_ext_key ext;
} hfs_btree_key;
struct hfs_ext_key ext;
} hfs_btree_key;
+#define HFS_MAX_CAT_KEYLEN (sizeof(struct hfs_cat_key) - sizeof(u8))
+#define HFS_MAX_EXT_KEYLEN (sizeof(struct hfs_ext_key) - sizeof(u8))
+
typedef union hfs_btree_key btree_key;
struct hfs_extent {
typedef union hfs_btree_key btree_key;
struct hfs_extent {