btrfs: remove stale newlines from log messages

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

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index d80a2786f56366296e80b8f9d4795dbefa232525..4662d92a4b7386cf82c264a0474eca825f8e4f1e 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -511,7 +511,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
                        } else if (compress) {
                                if (!btrfs_test_opt(root, COMPRESS))
                                        btrfs_info(root->fs_info,
-                                                  "btrfs: use %s compression\n",
+                                                  "btrfs: use %s compression",
                                                   compress_type);
                        }
                        break;
@@ -580,8 +580,15 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
                        }
                        break;
                case Opt_acl:
+#ifdef CONFIG_BTRFS_FS_POSIX_ACL
                        root->fs_info->sb->s_flags |= MS_POSIXACL;
                        break;
+#else
+                       btrfs_err(root->fs_info,
+                               "support for ACL not compiled in!");
+                       ret = -EINVAL;
+                       goto out;
+#endif
                case Opt_noacl:
                        root->fs_info->sb->s_flags &= ~MS_POSIXACL;
                        break;