diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-06 17:36:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:08:10 -0400 |
commit | b73f3d0e70b1ff6081980d3fa64e187d1796852c (patch) | |
tree | 55a14059c452e6ff17a2c9df58ff52d1be0fe474 /fs/hfsplus | |
parent | ffbc0671618e9354ec065144f8a66ec5dd7d5d75 (diff) |
fs/hfsplus: fix pr_foo() and hfs_dbg formats
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Suggested-By: Vyacheslav Dubeyko <slava@dubeyko.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hfsplus')
-rw-r--r-- | fs/hfsplus/extents.c | 7 | ||||
-rw-r--r-- | fs/hfsplus/super.c | 3 | ||||
-rw-r--r-- | fs/hfsplus/xattr.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/hfsplus/extents.c b/fs/hfsplus/extents.c index a09fcb68c364..feca524ce2a5 100644 --- a/fs/hfsplus/extents.c +++ b/fs/hfsplus/extents.c | |||
@@ -436,10 +436,9 @@ int hfsplus_file_extend(struct inode *inode, bool zeroout) | |||
436 | if (sbi->alloc_file->i_size * 8 < | 436 | if (sbi->alloc_file->i_size * 8 < |
437 | sbi->total_blocks - sbi->free_blocks + 8) { | 437 | sbi->total_blocks - sbi->free_blocks + 8) { |
438 | /* extend alloc file */ | 438 | /* extend alloc file */ |
439 | pr_err("extend alloc file! " | 439 | pr_err("extend alloc file! (%llu,%u,%u)\n", |
440 | "(%llu,%u,%u)\n", | 440 | sbi->alloc_file->i_size * 8, |
441 | sbi->alloc_file->i_size * 8, | 441 | sbi->total_blocks, sbi->free_blocks); |
442 | sbi->total_blocks, sbi->free_blocks); | ||
443 | return -ENOSPC; | 442 | return -ENOSPC; |
444 | } | 443 | } |
445 | 444 | ||
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index a513d2d36be9..4cf2024b87da 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c | |||
@@ -131,9 +131,10 @@ static int hfsplus_system_write_inode(struct inode *inode) | |||
131 | hfsplus_inode_write_fork(inode, fork); | 131 | hfsplus_inode_write_fork(inode, fork); |
132 | if (tree) { | 132 | if (tree) { |
133 | int err = hfs_btree_write(tree); | 133 | int err = hfs_btree_write(tree); |
134 | |||
134 | if (err) { | 135 | if (err) { |
135 | pr_err("b-tree write err: %d, ino %lu\n", | 136 | pr_err("b-tree write err: %d, ino %lu\n", |
136 | err, inode->i_ino); | 137 | err, inode->i_ino); |
137 | return err; | 138 | return err; |
138 | } | 139 | } |
139 | } | 140 | } |
diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c index aab093c27c59..744e2618046a 100644 --- a/fs/hfsplus/xattr.c +++ b/fs/hfsplus/xattr.c | |||
@@ -70,7 +70,7 @@ static void hfsplus_init_header_node(struct inode *attr_file, | |||
70 | loff_t tmp; | 70 | loff_t tmp; |
71 | 71 | ||
72 | hfs_dbg(ATTR_MOD, "init_hdr_attr_file: clump %u, node_size %u\n", | 72 | hfs_dbg(ATTR_MOD, "init_hdr_attr_file: clump %u, node_size %u\n", |
73 | clump_size, node_size); | 73 | clump_size, node_size); |
74 | 74 | ||
75 | /* The end of the node contains list of record offsets */ | 75 | /* The end of the node contains list of record offsets */ |
76 | rec_offsets = (__be16 *)(buf + node_size); | 76 | rec_offsets = (__be16 *)(buf + node_size); |