Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / fs / nilfs2 / super.c

diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 92acb005b78f398e3709f001d5e86167084f1df8..666107a18a22de8c5810fc7a18005fc3fc569618 100644 (file)
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -273,7 +273,7 @@ struct nilfs_super_block **nilfs_prepare_super(struct super_block *sb,
                }
        } else if (sbp[1] &&
                   sbp[1]->s_magic != cpu_to_le16(NILFS_SUPER_MAGIC)) {
-                       memcpy(sbp[1], sbp[0], nilfs->ns_sbsize);
+               memcpy(sbp[1], sbp[0], nilfs->ns_sbsize);
        }
 
        if (flip && sbp[1])
@@ -886,7 +886,7 @@ int nilfs_store_magic_and_option(struct super_block *sb,
        nilfs->ns_interval = le32_to_cpu(sbp->s_c_interval);
        nilfs->ns_watermark = le32_to_cpu(sbp->s_c_block_max);
 
-       return !parse_options(data, sb, 0) ? -EINVAL : 0 ;
+       return !parse_options(data, sb, 0) ? -EINVAL : 0;
 }
 
 int nilfs_check_feature_compatibility(struct super_block *sb,