fs/reiserfs: replace not-standard %Lu/%Ld

Fixes checkpatch warnings:

"WARNING: %Ld/%Lu are not-standard C, use %lld/%llu"

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
index cfaee91..aca73dd 100644 (file)
--- a/fs/reiserfs/item_ops.c
+++ b/fs/reiserfs/item_ops.c
@@ -54,7 +54,7 @@ static void sd_print_item(struct item_head *ih, char *item)
        } else {
                struct stat_data *sd = (struct stat_data *)item;
 
-               printk("\t0%-6o | %6Lu | %2u | %d | %s\n", sd_v2_mode(sd),
+               printk("\t0%-6o | %6llu | %2u | %d | %s\n", sd_v2_mode(sd),
                       (unsigned long long)sd_v2_size(sd), sd_v2_nlink(sd),
                       sd_v2_rdev(sd), print_time(sd_v2_mtime(sd)));
        }
@@ -408,7 +408,7 @@ static void direntry_print_item(struct item_head *ih, char *item)
                        namebuf[namelen + 2] = 0;
                }
 
-               printk("%d:  %-15s%-15d%-15d%-15Ld%-15Ld(%s)\n",
+               printk("%d:  %-15s%-15d%-15d%-15lld%-15lld(%s)\n",
                       i, namebuf,
                       deh_dir_id(deh), deh_objectid(deh),
                       GET_HASH_VALUE(deh_offset(deh)),

diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index c9b47e9..ae1dc84 100644 (file)
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -17,7 +17,7 @@ static char off_buf[80];
 static char *reiserfs_cpu_offset(struct cpu_key *key)
 {
        if (cpu_key_k_type(key) == TYPE_DIRENTRY)
-               sprintf(off_buf, "%Lu(%Lu)",
+               sprintf(off_buf, "%llu(%llu)",
                        (unsigned long long)
                        GET_HASH_VALUE(cpu_key_k_offset(key)),
                        (unsigned long long)
@@ -34,7 +34,7 @@ static char *le_offset(struct reiserfs_key *key)
 
        version = le_key_version(key);
        if (le_key_k_type(version, key) == TYPE_DIRENTRY)
-               sprintf(off_buf, "%Lu(%Lu)",
+               sprintf(off_buf, "%llu(%llu)",
                        (unsigned long long)
                        GET_HASH_VALUE(le_key_k_offset(version, key)),
                        (unsigned long long)

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index dd44468..24cbe01 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -2006,7 +2006,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,
                                            &s_search_path) == POSITION_FOUND);
 
        RFALSE(file_size > ROUND_UP(new_file_size),
-              "PAP-5680: truncate did not finish: new_file_size %Ld, current %Ld, oid %d",
+              "PAP-5680: truncate did not finish: new_file_size %lld, current %lld, oid %d",
               new_file_size, file_size, s_item_key.on_disk_key.k_objectid);
 
 update_and_out:

diff --cc fs/reiserfs/super.c
Simple merge