Merge with /home/shaggy/git/linus-clean/

1 files changed, 3 insertions, 2 deletions

diff --git a/fs/efs/super.c b/fs/efs/super.c
index d8d5ea9a99..afc4891feb 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -222,12 +222,13 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
                         sblock);
 #endif
         }
-        return(sblock);
+        return sblock;
 }
 
 static int efs_validate_super(struct efs_sb_info *sb, struct efs_super *super) {
 
-        if (!IS_EFS_MAGIC(be32_to_cpu(super->fs_magic))) return -1;
+        if (!IS_EFS_MAGIC(be32_to_cpu(super->fs_magic)))
+                return -1;
 
         sb->fs_magic     = be32_to_cpu(super->fs_magic);
         sb->total_blocks = be32_to_cpu(super->fs_size);