Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[firefly-linux-kernel-4.4.55.git] / fs / ocfs2 / super.h

diff --git a/fs/ocfs2/super.h b/fs/ocfs2/super.h
index c564177dfbdc41471f9fe68daa735d9fa72e7fb3..3b9cb3d0b0081e5835306e5eafe36ba2da7f0399 100644 (file)
--- a/fs/ocfs2/super.h
+++ b/fs/ocfs2/super.h
@@ -33,12 +33,18 @@ int ocfs2_publish_get_mount_state(struct ocfs2_super *osb,
 
 void __ocfs2_error(struct super_block *sb,
                   const char *function,
-                  const char *fmt, ...);
+                  const char *fmt, ...)
+       __attribute__ ((format (printf, 3, 4)));
+
 #define ocfs2_error(sb, fmt, args...) __ocfs2_error(sb, __PRETTY_FUNCTION__, fmt, ##args)
 
 void __ocfs2_abort(struct super_block *sb,
                   const char *function,
-                  const char *fmt, ...);
+                  const char *fmt, ...)
+       __attribute__ ((format (printf, 3, 4)));
+
 #define ocfs2_abort(sb, fmt, args...) __ocfs2_abort(sb, __PRETTY_FUNCTION__, fmt, ##args)
 
+unsigned long long ocfs2_max_file_offset(unsigned int blockshift);
+
 #endif /* OCFS2_SUPER_H */