diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-26 17:20:26 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-26 17:20:26 +0200 |
commit | bde40fe071e327857b478a440c599f54d4fc14dd (patch) | |
tree | 20aa357126bfbbe38962c4933616ed8e1c4cdafd /fs/ubifs/debug.c | |
parent | IPoIB: Fix crash when path record fails after path flush (diff) | |
parent | UBIFS: fix printk format warnings (diff) | |
download | linux-bde40fe071e327857b478a440c599f54d4fc14dd.tar.xz linux-bde40fe071e327857b478a440c599f54d4fc14dd.zip |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6
* 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6:
UBIFS: fix printk format warnings
UBIFS: remove incorrect assert
UBIFS: TNC / GC race fixes
UBIFS: create the name of the background thread in every case
Diffstat (limited to 'fs/ubifs/debug.c')
-rw-r--r-- | fs/ubifs/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index b9cb77473758..d7f7645779f2 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -538,7 +538,7 @@ void dbg_dump_node(const struct ubifs_info *c, const void *node) printk(KERN_DEBUG "\t%d orphan inode numbers:\n", n); for (i = 0; i < n; i++) printk(KERN_DEBUG "\t ino %llu\n", - le64_to_cpu(orph->inos[i])); + (unsigned long long)le64_to_cpu(orph->inos[i])); break; } default: |