vserver 1.9.3

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

diff --git a/fs/ntfs/debug.c b/fs/ntfs/debug.c
index 8ba0610..6723f18 100644 (file)
--- a/fs/ntfs/debug.c
+++ b/fs/ntfs/debug.c
@@ -127,22 +127,21 @@ void __ntfs_debug (const char *file, int line, const char *function,
        va_start(args, fmt);
        vsnprintf(err_buf, sizeof(err_buf), fmt, args);
        va_end(args);
-       printk(KERN_DEBUG "NTFS-fs DEBUG (%s, %d): %s: %s\n",
+       printk(KERN_DEBUG "NTFS-fs DEBUG (%s, %d): %s(): %s\n",
                file, line, flen ? function : "", err_buf);
        spin_unlock(&err_buf_lock);
 }
 
-/* Dump a run list. Caller has to provide synchronisation for @rl. */
-void ntfs_debug_dump_runlist(const run_list_element *rl)
+/* Dump a runlist. Caller has to provide synchronisation for @rl. */
+void ntfs_debug_dump_runlist(const runlist_element *rl)
 {
        int i;
        const char *lcn_str[5] = { "LCN_HOLE         ", "LCN_RL_NOT_MAPPED",
-                                  "LCN_ENOENT       ", "LCN_EINVAL       ",
-                                  "LCN_unknown      " };
+                                  "LCN_ENOENT       ", "LCN_unknown      " };
 
        if (!debug_msgs)
                return;
-       printk(KERN_DEBUG "NTFS-fs DEBUG: Dumping run list (values "
+       printk(KERN_DEBUG "NTFS-fs DEBUG: Dumping runlist (values "
                        "in hex):\n");
        if (!rl) {
                printk(KERN_DEBUG "Run list not present.\n");
@@ -155,17 +154,17 @@ void ntfs_debug_dump_runlist(const run_list_element *rl)
                if (lcn < (LCN)0) {
                        int index = -lcn - 1;
 
-                       if (index > -LCN_EINVAL - 1)
-                               index = 4;
+                       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 ?
-                               "" : " (run list end)");
+                               "" : " (runlist end)");
                } else
                        printk(KERN_DEBUG "%-16Lx %-16Lx  %-16Lx%s\n",
                                (rl + i)->vcn, (rl + i)->lcn,
                                (rl + i)->length, (rl + i)->length ?
-                               "" : " (run list end)");
+                               "" : " (runlist end)");
                if (!(rl + i)->length)
                        break;
        }