Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Fabian Frederick 2014-08-08 14:21:10 -07:00 committed by Linus Torvalds
parent edc023caf4
commit 53872ed077
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/reiserfs/item_ops.c
View file

@ -54,7 +54,7 @@ static void sd_print_item(struct item_head *ih, char *item)
} else { } else {
struct stat_data *sd = (struct stat_data *)item; 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), (unsigned long long)sd_v2_size(sd), sd_v2_nlink(sd),
sd_v2_rdev(sd), print_time(sd_v2_mtime(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; namebuf[namelen + 2] = 0;
} }
printk("%d: %-15s%-15d%-15d%-15Ld%-15Ld(%s)\n", printk("%d: %-15s%-15d%-15d%-15lld%-15lld(%s)\n",
i, namebuf, i, namebuf,
deh_dir_id(deh), deh_objectid(deh), deh_dir_id(deh), deh_objectid(deh),
GET_HASH_VALUE(deh_offset(deh)), GET_HASH_VALUE(deh_offset(deh)),

4
fs/reiserfs/prints.c
View file

@ -17,7 +17,7 @@ static char off_buf[80];
static char *reiserfs_cpu_offset(struct cpu_key *key) static char *reiserfs_cpu_offset(struct cpu_key *key)
{ {
if (cpu_key_k_type(key) == TYPE_DIRENTRY) if (cpu_key_k_type(key) == TYPE_DIRENTRY)
sprintf(off_buf, "%Lu(%Lu)", sprintf(off_buf, "%llu(%llu)",
(unsigned long long) (unsigned long long)
GET_HASH_VALUE(cpu_key_k_offset(key)), GET_HASH_VALUE(cpu_key_k_offset(key)),
(unsigned long long) (unsigned long long)
@ -34,7 +34,7 @@ static char *le_offset(struct reiserfs_key *key)
version = le_key_version(key); version = le_key_version(key);
if (le_key_k_type(version, key) == TYPE_DIRENTRY) if (le_key_k_type(version, key) == TYPE_DIRENTRY)
sprintf(off_buf, "%Lu(%Lu)", sprintf(off_buf, "%llu(%llu)",
(unsigned long long) (unsigned long long)
GET_HASH_VALUE(le_key_k_offset(version, key)), GET_HASH_VALUE(le_key_k_offset(version, key)),
(unsigned long long) (unsigned long long)

2
fs/reiserfs/stree.c
View file

@ -2006,7 +2006,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,
&s_search_path) == POSITION_FOUND); &s_search_path) == POSITION_FOUND);
RFALSE(file_size > ROUND_UP(new_file_size), 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); new_file_size, file_size, s_item_key.on_disk_key.k_objectid);
update_and_out: update_and_out:

7
fs/reiserfs/super.c
View file

@ -331,7 +331,7 @@ static int finish_unfinished(struct super_block *s)
* not completed truncate found. New size was * not completed truncate found. New size was
* committed together with "save" link * committed together with "save" link
*/ */
reiserfs_info(s, "Truncating %k to %Ld ..", reiserfs_info(s, "Truncating %k to %lld ..",
INODE_PKEY(inode), inode->i_size); INODE_PKEY(inode), inode->i_size);
/* don't update modification time */ /* don't update modification time */
@ -1577,7 +1577,7 @@ static int read_super_block(struct super_block *s, int offset)
rs = (struct reiserfs_super_block *)bh->b_data; rs = (struct reiserfs_super_block *)bh->b_data;
if (sb_blocksize(rs) != s->s_blocksize) { if (sb_blocksize(rs) != s->s_blocksize) {
reiserfs_warning(s, "sh-2011", "can't find a reiserfs " reiserfs_warning(s, "sh-2011", "can't find a reiserfs "
"filesystem on (dev %s, block %Lu, size %lu)", "filesystem on (dev %s, block %llu, size %lu)",
s->s_id, s->s_id,
(unsigned long long)bh->b_blocknr, (unsigned long long)bh->b_blocknr,
s->s_blocksize); s->s_blocksize);
@ -2441,8 +2441,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
struct buffer_head tmp_bh, *bh; struct buffer_head tmp_bh, *bh;
if (!current->journal_info) { if (!current->journal_info) {
printk(KERN_WARNING "reiserfs: Quota write (off=%Lu, len=%Lu)" printk(KERN_WARNING "reiserfs: Quota write (off=%llu, len=%llu) cancelled because transaction is not started.\n",
" cancelled because transaction is not started.\n",
(unsigned long long)off, (unsigned long long)len); (unsigned long long)off, (unsigned long long)len);
return -EIO; return -EIO;
} }