Merge tag 'clk-for-linus-3.16' of git://git.linaro.org/people/mike.turquette/linux...

[deliverable/linux.git] / fs / hfsplus / options.c

diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c
index 68537e8b7a0934859048ecd4cfb0e67cdcb6b819..c90b72ee676d8a022dd47b8577be6f6a40967425 100644 (file)
--- a/fs/hfsplus/options.c
+++ b/fs/hfsplus/options.c
@@ -173,9 +173,8 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi)
                        if (p)
                                sbi->nls = load_nls(p);
                        if (!sbi->nls) {
-                               pr_err("unable to load "
-                                               "nls mapping \"%s\"\n",
-                                       p);
+                               pr_err("unable to load nls mapping \"%s\"\n",
+                                      p);
                                kfree(p);
                                return 0;
                        }
@@ -232,8 +231,8 @@ int hfsplus_show_options(struct seq_file *seq, struct dentry *root)
        if (sbi->nls)
                seq_printf(seq, ",nls=%s", sbi->nls->charset);
        if (test_bit(HFSPLUS_SB_NODECOMPOSE, &sbi->flags))
-               seq_printf(seq, ",nodecompose");
+               seq_puts(seq, ",nodecompose");
        if (test_bit(HFSPLUS_SB_NOBARRIER, &sbi->flags))
-               seq_printf(seq, ",nobarrier");
+               seq_puts(seq, ",nobarrier");
        return 0;
 }