diff options
Diffstat (limited to 'fs/udf/udfdecl.h')
-rw-r--r-- | fs/udf/udfdecl.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index d89ef71887fc..9dd0814f1077 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h | |||
@@ -31,16 +31,8 @@ extern __printf(3, 4) void _udf_warn(struct super_block *sb, | |||
31 | #define udf_info(fmt, ...) \ | 31 | #define udf_info(fmt, ...) \ |
32 | pr_info("INFO " fmt, ##__VA_ARGS__) | 32 | pr_info("INFO " fmt, ##__VA_ARGS__) |
33 | 33 | ||
34 | #undef UDFFS_DEBUG | ||
35 | |||
36 | #ifdef UDFFS_DEBUG | ||
37 | #define udf_debug(fmt, ...) \ | ||
38 | printk(KERN_DEBUG pr_fmt("%s:%d:%s: " fmt), \ | ||
39 | __FILE__, __LINE__, __func__, ##__VA_ARGS__) | ||
40 | #else | ||
41 | #define udf_debug(fmt, ...) \ | 34 | #define udf_debug(fmt, ...) \ |
42 | no_printk(fmt, ##__VA_ARGS__) | 35 | pr_debug("%s:%d:%s: " fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__) |
43 | #endif | ||
44 | 36 | ||
45 | #define udf_fixed_to_variable(x) ( ( ( (x) >> 5 ) * 39 ) + ( (x) & 0x0000001F ) ) | 37 | #define udf_fixed_to_variable(x) ( ( ( (x) >> 5 ) * 39 ) + ( (x) & 0x0000001F ) ) |
46 | #define udf_variable_to_fixed(x) ( ( ( (x) / 39 ) << 5 ) + ( (x) % 39 ) ) | 38 | #define udf_variable_to_fixed(x) ( ( ( (x) / 39 ) << 5 ) + ( (x) % 39 ) ) |
@@ -178,6 +170,7 @@ extern int8_t udf_next_aext(struct inode *, struct extent_position *, | |||
178 | struct kernel_lb_addr *, uint32_t *, int); | 170 | struct kernel_lb_addr *, uint32_t *, int); |
179 | extern int8_t udf_current_aext(struct inode *, struct extent_position *, | 171 | extern int8_t udf_current_aext(struct inode *, struct extent_position *, |
180 | struct kernel_lb_addr *, uint32_t *, int); | 172 | struct kernel_lb_addr *, uint32_t *, int); |
173 | extern void udf_update_extra_perms(struct inode *inode, umode_t mode); | ||
181 | 174 | ||
182 | /* misc.c */ | 175 | /* misc.c */ |
183 | extern struct buffer_head *udf_tgetblk(struct super_block *sb, | 176 | extern struct buffer_head *udf_tgetblk(struct super_block *sb, |