aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-08-08 17:21:10 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 18:57:21 -0400
commit53872ed07786714bff3642ee9ee61afd3f4eb749 (patch)
treefd04c24cc8d522186769095ac60a2f3610109a8f
parentedc023caf407b74ee2eb56dda23437c5836655f3 (diff)
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>
-rw-r--r--fs/reiserfs/item_ops.c4
-rw-r--r--fs/reiserfs/prints.c4
-rw-r--r--fs/reiserfs/stree.c2
-rw-r--r--fs/reiserfs/super.c7
4 files changed, 8 insertions, 9 deletions
diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
index cfaee912ee09..aca73dd73906 100644
--- 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)
54 } else { 54 } else {
55 struct stat_data *sd = (struct stat_data *)item; 55 struct stat_data *sd = (struct stat_data *)item;
56 56
57 printk("\t0%-6o | %6Lu | %2u | %d | %s\n", sd_v2_mode(sd), 57 printk("\t0%-6o | %6llu | %2u | %d | %s\n", sd_v2_mode(sd),
58 (unsigned long long)sd_v2_size(sd), sd_v2_nlink(sd), 58 (unsigned long long)sd_v2_size(sd), sd_v2_nlink(sd),
59 sd_v2_rdev(sd), print_time(sd_v2_mtime(sd))); 59 sd_v2_rdev(sd), print_time(sd_v2_mtime(sd)));
60 } 60 }
@@ -408,7 +408,7 @@ static void direntry_print_item(struct item_head *ih, char *item)
408 namebuf[namelen + 2] = 0; 408 namebuf[namelen + 2] = 0;
409 } 409 }
410 410
411 printk("%d: %-15s%-15d%-15d%-15Ld%-15Ld(%s)\n", 411 printk("%d: %-15s%-15d%-15d%-15lld%-15lld(%s)\n",
412 i, namebuf, 412 i, namebuf,
413 deh_dir_id(deh), deh_objectid(deh), 413 deh_dir_id(deh), deh_objectid(deh),
414 GET_HASH_VALUE(deh_offset(deh)), 414 GET_HASH_VALUE(deh_offset(deh)),
diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index c9b47e91baf8..ae1dc841db3a 100644
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -17,7 +17,7 @@ static char off_buf[80];
17static char *reiserfs_cpu_offset(struct cpu_key *key) 17static char *reiserfs_cpu_offset(struct cpu_key *key)
18{ 18{
19 if (cpu_key_k_type(key) == TYPE_DIRENTRY) 19 if (cpu_key_k_type(key) == TYPE_DIRENTRY)
20 sprintf(off_buf, "%Lu(%Lu)", 20 sprintf(off_buf, "%llu(%llu)",
21 (unsigned long long) 21 (unsigned long long)
22 GET_HASH_VALUE(cpu_key_k_offset(key)), 22 GET_HASH_VALUE(cpu_key_k_offset(key)),
23 (unsigned long long) 23 (unsigned long long)
@@ -34,7 +34,7 @@ static char *le_offset(struct reiserfs_key *key)
34 34
35 version = le_key_version(key); 35 version = le_key_version(key);
36 if (le_key_k_type(version, key) == TYPE_DIRENTRY) 36 if (le_key_k_type(version, key) == TYPE_DIRENTRY)
37 sprintf(off_buf, "%Lu(%Lu)", 37 sprintf(off_buf, "%llu(%llu)",
38 (unsigned long long) 38 (unsigned long long)
39 GET_HASH_VALUE(le_key_k_offset(version, key)), 39 GET_HASH_VALUE(le_key_k_offset(version, key)),
40 (unsigned long long) 40 (unsigned long long)
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index dd44468edc2b..24cbe013240f 100644
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -2006,7 +2006,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,
2006 &s_search_path) == POSITION_FOUND); 2006 &s_search_path) == POSITION_FOUND);
2007 2007
2008 RFALSE(file_size > ROUND_UP(new_file_size), 2008 RFALSE(file_size > ROUND_UP(new_file_size),
2009 "PAP-5680: truncate did not finish: new_file_size %Ld, current %Ld, oid %d", 2009 "PAP-5680: truncate did not finish: new_file_size %lld, current %lld, oid %d",
2010 new_file_size, file_size, s_item_key.on_disk_key.k_objectid); 2010 new_file_size, file_size, s_item_key.on_disk_key.k_objectid);
2011 2011
2012update_and_out: 2012update_and_out:
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index a392cef6acc6..debdb8e6726b 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -331,7 +331,7 @@ static int finish_unfinished(struct super_block *s)
331 * not completed truncate found. New size was 331 * not completed truncate found. New size was
332 * committed together with "save" link 332 * committed together with "save" link
333 */ 333 */
334 reiserfs_info(s, "Truncating %k to %Ld ..", 334 reiserfs_info(s, "Truncating %k to %lld ..",
335 INODE_PKEY(inode), inode->i_size); 335 INODE_PKEY(inode), inode->i_size);
336 336
337 /* don't update modification time */ 337 /* don't update modification time */
@@ -1577,7 +1577,7 @@ static int read_super_block(struct super_block *s, int offset)
1577 rs = (struct reiserfs_super_block *)bh->b_data; 1577 rs = (struct reiserfs_super_block *)bh->b_data;
1578 if (sb_blocksize(rs) != s->s_blocksize) { 1578 if (sb_blocksize(rs) != s->s_blocksize) {
1579 reiserfs_warning(s, "sh-2011", "can't find a reiserfs " 1579 reiserfs_warning(s, "sh-2011", "can't find a reiserfs "
1580 "filesystem on (dev %s, block %Lu, size %lu)", 1580 "filesystem on (dev %s, block %llu, size %lu)",
1581 s->s_id, 1581 s->s_id,
1582 (unsigned long long)bh->b_blocknr, 1582 (unsigned long long)bh->b_blocknr,
1583 s->s_blocksize); 1583 s->s_blocksize);
@@ -2441,8 +2441,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
2441 struct buffer_head tmp_bh, *bh; 2441 struct buffer_head tmp_bh, *bh;
2442 2442
2443 if (!current->journal_info) { 2443 if (!current->journal_info) {
2444 printk(KERN_WARNING "reiserfs: Quota write (off=%Lu, len=%Lu)" 2444 printk(KERN_WARNING "reiserfs: Quota write (off=%llu, len=%llu) cancelled because transaction is not started.\n",
2445 " cancelled because transaction is not started.\n",
2446 (unsigned long long)off, (unsigned long long)len); 2445 (unsigned long long)off, (unsigned long long)len);
2447 return -EIO; 2446 return -EIO;
2448 } 2447 }