This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / ntfs / debug.c

diff --git a/fs/ntfs/debug.c b/fs/ntfs/debug.c
index e43c5ff..807150e 100644 (file)
--- a/fs/ntfs/debug.c
+++ b/fs/ntfs/debug.c
@@ -26,7 +26,7 @@
  * to protect concurrent accesses to it.
  */
 static char err_buf[1024];
-static spinlock_t err_buf_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(err_buf_lock);
 
 /**
  * __ntfs_warning - output a warning to the syslog
@@ -53,6 +53,10 @@ void __ntfs_warning(const char *function, const struct super_block *sb,
        va_list args;
        int flen = 0;
 
+#ifndef DEBUG
+       if (!printk_ratelimit())
+               return;
+#endif
        if (function)
                flen = strlen(function);
        spin_lock(&err_buf_lock);
@@ -93,6 +97,10 @@ void __ntfs_error(const char *function, const struct super_block *sb,
        va_list args;
        int flen = 0;
 
+#ifndef DEBUG
+       if (!printk_ratelimit())
+               return;
+#endif
        if (function)
                flen = strlen(function);
        spin_lock(&err_buf_lock);
@@ -156,14 +164,17 @@ void ntfs_debug_dump_runlist(const runlist_element *rl)
                        if (index > -LCN_ENOENT - 1)
                                index = 3;
                        printk(KERN_DEBUG "%-16Lx %s %-16Lx%s\n",
-                                       (rl + i)->vcn, lcn_str[index],
-                                       (rl + i)->length, (rl + i)->length ?
-                                       "" : " (runlist end)");
+                                       (long long)(rl + i)->vcn, lcn_str[index],
+                                       (long long)(rl + i)->length,
+                                       (rl + i)->length ? "" :
+                                               " (runlist end)");
                } else
                        printk(KERN_DEBUG "%-16Lx %-16Lx  %-16Lx%s\n",
-                                       (rl + i)->vcn, (rl + i)->lcn,
-                                       (rl + i)->length, (rl + i)->length ?
-                                       "" : " (runlist end)");
+                                       (long long)(rl + i)->vcn,
+                                       (long long)(rl + i)->lcn,
+                                       (long long)(rl + i)->length,
+                                       (rl + i)->length ? "" :
+                                               " (runlist end)");
                if (!(rl + i)->length)
                        break;
        }