diff options
author | marcin.slusarz@gmail.com <marcin.slusarz@gmail.com> | 2008-01-30 16:03:59 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2008-04-17 08:22:29 -0400 |
commit | d652eefb70142c64495f4188883f9dfc0430a96b (patch) | |
tree | a67a3ebbc01ee7c68c8ca90f616d2a282907fe64 /fs/udf/udfdecl.h | |
parent | 1ab9278570077101d1e367399686be62b22c4019 (diff) |
udf: replace udf_*_offset macros with functions
- translate udf_file_entry_alloc_offset macro into function
- translate udf_ext0_offset macro into function
- add comment about crypticly named fields in struct udf_inode_info
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/udfdecl.h')
-rw-r--r-- | fs/udf/udfdecl.h | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 26bc9c237cb7..cc15f58d497a 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h | |||
@@ -11,6 +11,7 @@ | |||
11 | 11 | ||
12 | #include "udf_sb.h" | 12 | #include "udf_sb.h" |
13 | #include "udfend.h" | 13 | #include "udfend.h" |
14 | #include "udf_i.h" | ||
14 | 15 | ||
15 | #define UDF_PREALLOCATE | 16 | #define UDF_PREALLOCATE |
16 | #define UDF_DEFAULT_PREALLOC_BLOCKS 8 | 17 | #define UDF_DEFAULT_PREALLOC_BLOCKS 8 |
@@ -42,16 +43,24 @@ do { \ | |||
42 | #define UDF_NAME_LEN 256 | 43 | #define UDF_NAME_LEN 256 |
43 | #define UDF_PATH_LEN 1023 | 44 | #define UDF_PATH_LEN 1023 |
44 | 45 | ||
45 | #define udf_file_entry_alloc_offset(inode)\ | 46 | static inline size_t udf_file_entry_alloc_offset(struct inode *inode) |
46 | (UDF_I(inode)->i_use ?\ | 47 | { |
47 | sizeof(struct unallocSpaceEntry) :\ | 48 | struct udf_inode_info *iinfo = UDF_I(inode); |
48 | ((UDF_I(inode)->i_efe ?\ | 49 | if (iinfo->i_use) |
49 | sizeof(struct extendedFileEntry) :\ | 50 | return sizeof(struct unallocSpaceEntry); |
50 | sizeof(struct fileEntry)) + UDF_I(inode)->i_lenEAttr)) | 51 | else if (iinfo->i_efe) |
51 | 52 | return sizeof(struct extendedFileEntry) + iinfo->i_lenEAttr; | |
52 | #define udf_ext0_offset(inode)\ | 53 | else |
53 | (UDF_I(inode)->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB ?\ | 54 | return sizeof(struct fileEntry) + iinfo->i_lenEAttr; |
54 | udf_file_entry_alloc_offset(inode) : 0) | 55 | } |
56 | |||
57 | static inline size_t udf_ext0_offset(struct inode *inode) | ||
58 | { | ||
59 | if (UDF_I(inode)->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) | ||
60 | return udf_file_entry_alloc_offset(inode); | ||
61 | else | ||
62 | return 0; | ||
63 | } | ||
55 | 64 | ||
56 | #define udf_get_lb_pblock(sb,loc,offset) udf_get_pblock((sb), (loc).logicalBlockNum, (loc).partitionReferenceNum, (offset)) | 65 | #define udf_get_lb_pblock(sb,loc,offset) udf_get_pblock((sb), (loc).logicalBlockNum, (loc).partitionReferenceNum, (offset)) |
57 | 66 | ||