Merge with /home/shaggy/git/linus-clean/

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

1 files changed, 9 insertions, 6 deletions

diff --git a/fs/ntfs/debug.c b/fs/ntfs/debug.c
index 6fb6bb5e3723..807150e2c2b9 100644
--- a/fs/ntfs/debug.c
+++ b/fs/ntfs/debug.c
@@ -164,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;
         }