hfsplus: %L-to-%ll, macro correction, and remove unneeded braces

Clean-up based on checkpatch.pl report against unnecessary braces
(`{' and `}'), non-standard format option %Lu (%llu recommended)
as well as one trailing statement in a macro definition which
should have been on the next line.

Signed-off-by: Anton Salikhmetov <alexo@tuxera.com>
Signed-off-by: Christoph Hellwig <hch@tuxera.com>

3 files changed, 14 insertions, 14 deletions

diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c
index c8f4ea4bb5ed..1c42cc5b899f 100644
--- a/fs/hfsplus/bnode.c
+++ b/fs/hfsplus/bnode.c
@@ -363,9 +363,8 @@ void hfs_bnode_unlink(struct hfs_bnode *node)
                 tree->leaf_tail = node->prev;
 
         /* move down? */
-        if (!node->prev && !node->next) {
+        if (!node->prev && !node->next)
                 dprint(DBG_BNODE_MOD, "hfs_btree_del_level\n");
-        }
         if (!node->parent) {
                 tree->root = 0;
                 tree->depth = 0;
@@ -392,11 +391,9 @@ struct hfs_bnode *hfs_bnode_findhash(struct hfs_btree *tree, u32 cnid)
         }
 
         for (node = tree->node_hash[hfs_bnode_hash(cnid)];
-             node; node = node->next_hash) {
-                if (node->this == cnid) {
+                        node; node = node->next_hash)
+                if (node->this == cnid)
                         return node;
-                }
-        }
         return NULL;
 }
 
diff --git a/fs/hfsplus/extents.c b/fs/hfsplus/extents.c
index 4b693b5b6230..52a0bcaa7b6d 100644
--- a/fs/hfsplus/extents.c
+++ b/fs/hfsplus/extents.c
@@ -397,12 +397,13 @@ int hfsplus_file_extend(struct inode *inode)
         u32 start, len, goal;
         int res;
 
-        if (sbi->alloc_file->i_size * 8 <
-            sbi->total_blocks - sbi->free_blocks + 8) {
+        if (sbi->total_blocks - sbi->free_blocks + 8 >
+                        sbi->alloc_file->i_size * 8) {
                 /* extend alloc file */
-                printk(KERN_ERR "hfs: extend alloc file! (%Lu,%u,%u)\n",
-                                sbi->alloc_file->i_size * 8,
-                                sbi->total_blocks, sbi->free_blocks);
+                printk(KERN_ERR "hfs: extend alloc file! "
+                                "(%llu,%u,%u)\n",
+                        sbi->alloc_file->i_size * 8,
+                        sbi->total_blocks, sbi->free_blocks);
                 return -ENOSPC;
         }
 
@@ -490,8 +491,9 @@ void hfsplus_file_truncate(struct inode *inode)
         u32 alloc_cnt, blk_cnt, start;
         int res;
 
-        dprint(DBG_INODE, "truncate: %lu, %Lu -> %Lu\n",
-                inode->i_ino, (long long)hip->phys_size, inode->i_size);
+        dprint(DBG_INODE, "truncate: %lu, %llu -> %llu\n",
+                inode->i_ino, (long long)hip->phys_size,
+                inode->i_size);
 
         if (inode->i_size > hip->phys_size) {
                 struct address_space *mapping = inode->i_mapping;
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index a15e1c11e820..f7cbdf89ac9b 100644
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -31,7 +31,8 @@
 #define DBG_MASK        (0)
 
 #define dprint(flg, fmt, args...) \
-        if (flg & DBG_MASK) printk(fmt , ## args)
+        if (flg & DBG_MASK) \
+                printk(fmt , ## args)
 
 /* Runtime config options */
 #define HFSPLUS_DEF_CR_TYPE    0x3F3F3F3F  /* '????' */