Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[pandora-kernel.git] / fs / udf / udfdecl.h

diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index 79aae3f..f34e6fc 100644 (file)
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -18,15 +18,13 @@
 #define UDF_PREALLOCATE
 #define UDF_DEFAULT_PREALLOC_BLOCKS    8
 
-__attribute__((format(printf, 3, 4)))
-extern void _udf_err(struct super_block *sb, const char *function,
-                    const char *fmt, ...);
+extern __printf(3, 4) void _udf_err(struct super_block *sb,
+               const char *function, const char *fmt, ...);
 #define udf_err(sb, fmt, ...)                                  \
        _udf_err(sb, __func__, fmt, ##__VA_ARGS__)
 
-__attribute__((format(printf, 3, 4)))
-extern void _udf_warn(struct super_block *sb, const char *function,
-                     const char *fmt, ...);
+extern __printf(3, 4) void _udf_warn(struct super_block *sb,
+               const char *function, const char *fmt, ...);
 #define udf_warn(sb, fmt, ...)                                 \
        _udf_warn(sb, __func__, fmt, ##__VA_ARGS__)