summaryrefslogtreecommitdiff
path: root/fs/hfsplus
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-07 01:36:31 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-07 03:08:10 +0400
commitb73f3d0e70b1ff6081980d3fa64e187d1796852c (patch)
tree55a14059c452e6ff17a2c9df58ff52d1be0fe474 /fs/hfsplus
parentffbc0671618e9354ec065144f8a66ec5dd7d5d75 (diff)
downloadlinux-b73f3d0e70b1ff6081980d3fa64e187d1796852c.tar.xz
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.c7
-rw-r--r--fs/hfsplus/super.c3
-rw-r--r--fs/hfsplus/xattr.c2
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)
if (sbi->alloc_file->i_size * 8 <
sbi->total_blocks - sbi->free_blocks + 8) {
/* extend alloc file */
- pr_err("extend alloc file! "
- "(%llu,%u,%u)\n",
- sbi->alloc_file->i_size * 8,
- sbi->total_blocks, sbi->free_blocks);
+ pr_err("extend alloc file! (%llu,%u,%u)\n",
+ sbi->alloc_file->i_size * 8,
+ sbi->total_blocks, sbi->free_blocks);
return -ENOSPC;
}
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)
hfsplus_inode_write_fork(inode, fork);
if (tree) {
int err = hfs_btree_write(tree);
+
if (err) {
pr_err("b-tree write err: %d, ino %lu\n",
- err, inode->i_ino);
+ err, inode->i_ino);
return err;
}
}
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,
loff_t tmp;
hfs_dbg(ATTR_MOD, "init_hdr_attr_file: clump %u, node_size %u\n",
- clump_size, node_size);
+ clump_size, node_size);
/* The end of the node contains list of record offsets */
rec_offsets = (__be16 *)(buf + node_size);