diff options
author | Joe Perches <joe@perches.com> | 2011-10-10 04:08:03 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2011-10-10 13:29:01 -0400 |
commit | 8076c363da15e7c35a4094974d1b4bcc196b5fa9 (patch) | |
tree | e15e500b2371cc41c736433aeb8840c28fe9c4da /fs/udf/udfdecl.h | |
parent | 7e273e3b41e32716dc122b293b5f15635af495ff (diff) |
udf: Rename udf_error to udf_err
Rename udf_error to udf_err for consistency with normal logging
uses of pr_err.
Rename function udf_err to _udf_err.
Remove __func__ from uses and move __func__ to a new udf_err
macro that calls _udf_err.
Some of the udf_error uses had \n terminations, some did not so
standardize \n's to udf_err uses, remove \n from _udf_err function.
Coalesce udf_err formats.
One message prefixed with udf_read_super is now prefixed with
udf_fill_super.
Reviewed-by: NamJae Jeon <linkinjeon@gmail.com>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/udfdecl.h')
-rw-r--r-- | fs/udf/udfdecl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 81e66afecd42..7bc3ba1415fc 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h | |||
@@ -33,13 +33,14 @@ __attribute__((format(printf, 3, 4))) | |||
33 | extern void udf_warning(struct super_block *, const char *, const char *, ...); | 33 | extern void udf_warning(struct super_block *, const char *, const char *, ...); |
34 | 34 | ||
35 | __attribute__((format(printf, 3, 4))) | 35 | __attribute__((format(printf, 3, 4))) |
36 | extern void udf_error(struct super_block *sb, const char *function, | 36 | extern void _udf_err(struct super_block *sb, const char *function, |
37 | const char *fmt, ...); | 37 | const char *fmt, ...); |
38 | #define udf_err(sb, fmt, ...) \ | ||
39 | _udf_err(sb, __func__, fmt, ##__VA_ARGS__) | ||
38 | 40 | ||
39 | #define udf_info(f, a...) \ | 41 | #define udf_info(f, a...) \ |
40 | printk(KERN_INFO "UDF-fs INFO " f, ##a); | 42 | printk(KERN_INFO "UDF-fs INFO " f, ##a); |
41 | 43 | ||
42 | |||
43 | #define udf_fixed_to_variable(x) ( ( ( (x) >> 5 ) * 39 ) + ( (x) & 0x0000001F ) ) | 44 | #define udf_fixed_to_variable(x) ( ( ( (x) >> 5 ) * 39 ) + ( (x) & 0x0000001F ) ) |
44 | #define udf_variable_to_fixed(x) ( ( ( (x) / 39 ) << 5 ) + ( (x) % 39 ) ) | 45 | #define udf_variable_to_fixed(x) ( ( ( (x) / 39 ) << 5 ) + ( (x) % 39 ) ) |
45 | 46 | ||